From c942b19ef0f49439049305ecd2218dc9a9654908 Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 4 Jan 2016 14:25:35 -0500 Subject: [PATCH 1/3] Adding markers into branch for pull request --- assets/CustomMarkers.js | 34 ++++++++++++++++++++++++++++++++++ assets/main.js | 7 ++----- buildtools/optimize-js.sh | 4 ++-- index.html | 1 + 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 assets/CustomMarkers.js diff --git a/assets/CustomMarkers.js b/assets/CustomMarkers.js new file mode 100644 index 0000000..80cd5e4 --- /dev/null +++ b/assets/CustomMarkers.js @@ -0,0 +1,34 @@ +var CustomMarkers = { + marker_array: { //private list of icons, not meant for direct access + default: new L.divIcon({ + //iconUrl: 'http://austinmoffa.github.io/gh/assets/images/icons/marker-default.svg', + html: '', + iconSize:[14, 34], + iconAnchor: [7, 26], + className: 'leaflet-default-custom-marker', + }), + color: {}, + }, + getMarker: function(name, color) { + if (name == 'default' || !name) { + if (!color) { + return this.marker_array.default; + } else { + return this.getReplaceDefaultColor(color, '#4dea51'); + } + } + }, + getReplaceDefaultColor: function(newcolor, defaultcolor) { + if (!this.marker_array.color[newcolor]) { //only do this once for each color each load + var ret = this.marker_array.default.options.html.replace(defaultcolor, newcolor); + this.marker_array.color[newcolor] = new L.divIcon({ + html: ret, + iconSize: this.marker_array.default.options.iconSize, + iconAnchor: this.marker_array.default.options.iconAnchor, + className: this.marker_array.default.options.className, + }); + } + return this.marker_array.color[newcolor]; + }, + +}; diff --git a/assets/main.js b/assets/main.js index fbd295e..ffa0537 100644 --- a/assets/main.js +++ b/assets/main.js @@ -1183,11 +1183,8 @@ function create_topojson_layer(dataset) { if (dataset.type === "regions" || dataset.type === "points") { newLayer.setStyle(dataset.style); newLayer.options.pointToLayer = function(feature, latlng) { - var smallIcon = L.VectorMarkers.icon({ - icon: 'circle', - markerColor: dataset.style.color - }); - return L.marker(latlng, {icon: smallIcon}); + smallIcon = CustomMarkers.getMarker('default', dataset.style.color); + return L.marker(latlng,{icon: smallIcon}); }; } newLayer.on("mouseover", function(e) { diff --git a/buildtools/optimize-js.sh b/buildtools/optimize-js.sh index 645910f..a10464f 100755 --- a/buildtools/optimize-js.sh +++ b/buildtools/optimize-js.sh @@ -18,7 +18,7 @@ touch ./start.js echo "load_map_data(\"topojson\");" >> ./start.js -uglifyjs --prefix relative --output ${outpath}main.${now}.min.js --screw-ie8 --mangle --compress dead_code,loops,warnings,join_vars --reserved '$,L,map,window,data_obj' --stats --verbose -- ../assets/jquery-1.11.2/jquery.min.js ../assets/spin-2.1.0/spin.min.js ../assets/leaflet-0.7.3/js/leaflet.js ../assets/leaflet-0.7.3/js/Leaflet.vector-markers.js ../assets/leaflet-0.7.3/js/leaflet-providers.js ../assets/leaflet-0.7.3/js/leaflet-pip.min.js ../assets/leaflet-0.7.3/js/leaflet.spin.js ../assets/leaflet-0.7.3/js/leaflet.geojsoncss.min.js ../assets/leaflet-0.7.3/js/l.control.geosearch.js ../assets/leaflet-0.7.3/js/l.geosearch.provider.openstreetmap.js ../assets/leaflet-0.7.3/js/L.Control.Pan.js ../assets/leaflet-0.7.3/js/L.Control.ZoomBox.min.js ../assets/leaflet-0.7.3/js/leaflet.defaultextent.js ../assets/leaflet-0.7.3/js/leaflet.groupedlayercontrol.min.js ../assets/topojson-1.0/topojson.v1.min.js ../assets/leaflet-0.7.3/js/L.TopoJSON.min.js ../assets/main.js ./start.js +uglifyjs --prefix relative --output ${outpath}main.${now}.min.js --screw-ie8 --mangle --compress dead_code,loops,warnings,join_vars --reserved '$,L,map,window,data_obj' --stats --verbose -- ../assets/jquery-1.11.2/jquery.min.js ../assets/spin-2.1.0/spin.min.js ../assets/leaflet-0.7.3/js/leaflet.js ../assets/leaflet-0.7.3/js/Leaflet.vector-markers.js ../assets/leaflet-0.7.3/js/leaflet-providers.js ../assets/leaflet-0.7.3/js/leaflet-pip.min.js ../assets/leaflet-0.7.3/js/leaflet.spin.js ../assets/leaflet-0.7.3/js/leaflet.geojsoncss.min.js ../assets/leaflet-0.7.3/js/l.control.geosearch.js ../assets/leaflet-0.7.3/js/l.geosearch.provider.openstreetmap.js ../assets/leaflet-0.7.3/js/L.Control.Pan.js ../assets/leaflet-0.7.3/js/L.Control.ZoomBox.min.js ../assets/leaflet-0.7.3/js/leaflet.defaultextent.js ../assets/leaflet-0.7.3/js/leaflet.groupedlayercontrol.min.js ../assets/topojson-1.0/topojson.v1.min.js ../assets/leaflet-0.7.3/js/L.TopoJSON.min.js ../assets/main.js ../assets/CustomMarkers.js ./start.js # --source-map ${outpath}main.${now}.min.js.map --source-map-root http://localhost:8000/assets --source-map-url # IE 8 @@ -31,7 +31,7 @@ touch ./start-ie8.js echo "load_map_data(\"geojson\");" >> ./start-ie8.js -uglifyjs --prefix relative --output ${outpath}main.ie8.${now}.min.js --mangle --compress dead_code,loops,warnings,join_vars --reserved '$,L,map,window,data_obj' --stats --verbose -- ../assets/ie8_polyfills.js ../assets/jquery-1.11.2/jquery.min.js ../assets/spin-2.1.0/spin.min.js ../assets/leaflet-0.7.3/js/leaflet.js ../assets/leaflet-0.7.3/js/Leaflet.vector-markers.js ../assets/leaflet-0.7.3/js/leaflet-providers.js ../assets/leaflet-0.7.3/js/leaflet-pip.min.js ../assets/leaflet-0.7.3/js/leaflet.spin.js ../assets/leaflet-0.7.3/js/leaflet.geojsoncss.min.js ../assets/leaflet-0.7.3/js/l.control.geosearch.js ../assets/leaflet-0.7.3/js/l.geosearch.provider.openstreetmap.js ../assets/leaflet-0.7.3/js/L.Control.Pan.js ../assets/leaflet-0.7.3/js/L.Control.ZoomBox.min.js ../assets/leaflet-0.7.3/js/leaflet.defaultextent.js ../assets/leaflet-0.7.3/js/leaflet.groupedlayercontrol.min.js ../assets/main.js ./start-ie8.js +uglifyjs --prefix relative --output ${outpath}main.ie8.${now}.min.js --mangle --compress dead_code,loops,warnings,join_vars --reserved '$,L,map,window,data_obj' --stats --verbose -- ../assets/ie8_polyfills.js ../assets/jquery-1.11.2/jquery.min.js ../assets/spin-2.1.0/spin.min.js ../assets/leaflet-0.7.3/js/leaflet.js ../assets/leaflet-0.7.3/js/Leaflet.vector-markers.js ../assets/leaflet-0.7.3/js/leaflet-providers.js ../assets/leaflet-0.7.3/js/leaflet-pip.min.js ../assets/leaflet-0.7.3/js/leaflet.spin.js ../assets/leaflet-0.7.3/js/leaflet.geojsoncss.min.js ../assets/leaflet-0.7.3/js/l.control.geosearch.js ../assets/leaflet-0.7.3/js/l.geosearch.provider.openstreetmap.js ../assets/leaflet-0.7.3/js/L.Control.Pan.js ../assets/leaflet-0.7.3/js/L.Control.ZoomBox.min.js ../assets/leaflet-0.7.3/js/leaflet.defaultextent.js ../assets/leaflet-0.7.3/js/leaflet.groupedlayercontrol.min.js ../assets/main.js ../assets/CustomMarkers.js ./start-ie8.js # --source-map ${outpath}main.ie8.${now}.min.js.map --source-map-root http://localhost:8000/assets --source-map-url # Datasets Credits diff --git a/index.html b/index.html index 3c11f67..1fb21c6 100644 --- a/index.html +++ b/index.html @@ -65,6 +65,7 @@ --> +