Commit 3402f0da authored by jkerr's avatar jkerr
Browse files

Added buttons to map, still need listeners

parent 1ccd0ed4
......@@ -4,7 +4,6 @@
<list default="true" id="cccfd40b-d5c2-4431-bcfd-f34d25764049" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/map.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/setbooking.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/setbooking.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -19,38 +18,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/style/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="764">
<caret line="204" selection-start-line="204" selection-end-line="204" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/scripts/data/POI.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="46" column="46" lean-forward="true" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
<state relative-caret-position="510">
<caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
......@@ -101,14 +73,14 @@
<option value="$PROJECT_DIR$/scripts/data/tentInfo.html" />
<option value="$PROJECT_DIR$/scripts/data/vanInfo.html" />
<option value="$PROJECT_DIR$/scripts/leaflet/leafletAjax.js" />
<option value="$PROJECT_DIR$/style/style.css" />
<option value="$PROJECT_DIR$/scripts/switchbooking.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/scripts/filterSites.js" />
<option value="$PROJECT_DIR$/scripts/setbooking.js" />
<option value="$PROJECT_DIR$/scripts/data/POI.geojson" />
<option value="$PROJECT_DIR$/scripts/map.js" />
<option value="$PROJECT_DIR$/scripts/data/POI.json" />
<option value="$PROJECT_DIR$/style/style.css" />
<option value="$PROJECT_DIR$/scripts/filterSites.js" />
<option value="$PROJECT_DIR$/scripts/map.js" />
</list>
</option>
</component>
......@@ -203,7 +175,7 @@
<workItem from="1566278943384" duration="34000" />
<workItem from="1566340107468" duration="6269000" />
<workItem from="1566359872857" duration="22497000" />
<workItem from="1566431482065" duration="4231000" />
<workItem from="1566431482065" duration="6241000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1565679239864</created>
......@@ -247,17 +219,31 @@
<option name="project" value="LOCAL" />
<updated>1566383025654</updated>
</task>
<option name="localTasksCounter" value="7" />
<task id="LOCAL-00007" summary="worked on map">
<created>1566435758626</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1566435758626</updated>
</task>
<task id="LOCAL-00008" summary="Added buttons to map, still need listeners">
<created>1566437728002</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1566437728002</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47794000" />
<option name="totallyTimeSpent" value="49804000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1189" height="1347" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22580644" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22580644" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -287,7 +273,9 @@
<MESSAGE value="Finished css, made massive progress" />
<MESSAGE value="Added filter" />
<MESSAGE value="Added localStorage" />
<option name="LAST_COMMIT_MESSAGE" value="Added localStorage" />
<MESSAGE value="worked on map" />
<MESSAGE value="Added buttons to map, still need listeners" />
<option name="LAST_COMMIT_MESSAGE" value="Added buttons to map, still need listeners" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/scripts/data/cabinInfo.html">
......@@ -363,39 +351,39 @@
</entry>
<entry file="file://$PROJECT_DIR$/scripts/filterSites.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<state relative-caret-position="173">
<caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/scripts/data/POI.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
<state relative-caret-position="45">
<caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/style/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="764">
<caret line="204" selection-start-line="204" selection-end-line="204" />
<state relative-caret-position="762">
<caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
<state relative-caret-position="720">
<caret line="48" column="27" lean-forward="true" selection-start-line="48" selection-start-column="27" selection-end-line="48" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/POI.json">
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="46" column="46" lean-forward="true" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" />
<state relative-caret-position="510">
<caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
......@@ -33,8 +33,6 @@ var Map = (function () {
properties = cFeature.properties;
cType = cFeature.type;
console.log(type);
if (type === "all" || cType === type || cType === "camp") {
createMarker(geo, properties);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment