diff --git a/ffmap/mapnik/hoods.xml b/ffmap/mapnik/hoods.xml deleted file mode 100644 index a542e7e..0000000 --- a/ffmap/mapnik/hoods.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - hoodborder - - csv - csv/hoods.csv - - - - hoodpoint - - csv - csv/hood-points.csv - - - diff --git a/ffmap/mapnik/run.sh b/ffmap/mapnik/run.sh index 54a5b07..a96adf8 100755 --- a/ffmap/mapnik/run.sh +++ b/ffmap/mapnik/run.sh @@ -3,7 +3,6 @@ liteserv.py routers.xml --processes=5 & liteserv.py routers_v2.xml -p 8003 --processes=5 & liteserv.py routers_local.xml -p 8004 --processes=5 & -liteserv.py hoods.xml -p 8001 --processes=5 & liteserv.py hoods_v2.xml -p 8002 --processes=5 liteserv.py hoods_poly.xml -p 8005 --processes=5 diff --git a/ffmap/mapnik/tilestache.cfg b/ffmap/mapnik/tilestache.cfg index a98f8ff..0256e3f 100644 --- a/ffmap/mapnik/tilestache.cfg +++ b/ffmap/mapnik/tilestache.cfg @@ -34,16 +34,6 @@ "metatile": {"buffer": 128}, "cache lifespan": 300 }, - "tiles/hoods": { - "provider": { - "class": "dynmapnik:DynMapnik", - "kwargs": { - "mapfile": "/usr/share/ffmap/hoods.xml" - } - }, - "metatile": {"buffer": 128}, - "cache lifespan": 300 - }, "tiles/hoods_v2": { "provider": { "class": "dynmapnik:DynMapnik", diff --git a/ffmap/maptools.py b/ffmap/maptools.py index b21ca69..feb59f5 100644 --- a/ffmap/maptools.py +++ b/ffmap/maptools.py @@ -215,28 +215,6 @@ def update_mapnik_csv(mysql): for link in linksl3local: csv.write("\"LINESTRING (%f %f,%f %f)\"\n" % link) - dbhoods = mysql.fetchall(""" - SELECT name, lat, lng FROM hoodsv1 - WHERE lat IS NOT NULL AND lng IS NOT NULL - """) - with open(os.path.join(CONFIG["csv_dir"], "hood-points.csv"), "w", encoding="UTF-8") as csv: - csv.write("lng,lat,name\n") - for hood in dbhoods: - csv.write("%f,%f,\"%s\"\n" % ( - hood["lng"], - hood["lat"], - hood["name"] - )) - - with open(os.path.join(CONFIG["csv_dir"], "hoods.csv"), "w") as csv: - csv.write("WKT\n") - hoods = [] - for hood in dbhoods: - # convert coordinates info marcator sphere as voronoi doesn't work with lng/lat - x, y = merc_sphere(hood["lng"], hood["lat"]) - hoods.append([x, y]) - draw_voronoi_lines(csv, hoods) - dbhoodsv2 = mysql.fetchall(""" SELECT name, lat, lng FROM hoodsv2 WHERE lat IS NOT NULL AND lng IS NOT NULL @@ -294,7 +272,6 @@ def update_mapnik_csv(mysql): csv.write("\"LINESTRING (%f %f,%f %f)\"\n" % (oldlon, oldlat, polygon[0]["lon"], polygon[0]["lat"])) # touch mapnik XML files to trigger tilelite watcher - touch("/usr/share/ffmap/hoods.xml") touch("/usr/share/ffmap/hoods_v2.xml") touch("/usr/share/ffmap/hoods_poly.xml") touch("/usr/share/ffmap/routers.xml") diff --git a/ffmap/web/application.py b/ffmap/web/application.py index 61404e3..3838fae 100755 --- a/ffmap/web/application.py +++ b/ffmap/web/application.py @@ -30,7 +30,6 @@ tileurls = { "routers": "/tiles/routers", "routers_v2": "/tiles/routers_v2", "routers_local": "/tiles/routers_local", - "hoods": "/tiles/hoods", "hoods_v2": "/tiles/hoods_v2", "hoods_poly": "/tiles/hoods_poly" } diff --git a/ffmap/web/static/js/map.js b/ffmap/web/static/js/map.js index 7a8aabe..cbf7c1b 100644 --- a/ffmap/web/static/js/map.js +++ b/ffmap/web/static/js/map.js @@ -28,7 +28,6 @@ var overlay_config = { var routers = new L.TileLayer(tileurls.routers + '/{z}/{x}/{y}.png', overlay_config); var routers_v2 = new L.TileLayer(tileurls.routers_v2 + '/{z}/{x}/{y}.png', overlay_config); var routers_local = new L.TileLayer(tileurls.routers_local + '/{z}/{x}/{y}.png', overlay_config); -var hoods = new L.TileLayer(tileurls.hoods + '/{z}/{x}/{y}.png', overlay_config); var hoods_v2 = new L.TileLayer(tileurls.hoods_v2 + '/{z}/{x}/{y}.png', overlay_config); var hoods_poly = new L.TileLayer(tileurls.hoods_poly + '/{z}/{x}/{y}.png', overlay_config); var popuplayer = new L.TileLayer(''); @@ -40,7 +39,6 @@ layersControl = new L.Control.Layers({ "Routers V1": routers, "Routers V2": routers_v2, "Local Routers": routers_local, - "Hoods V1": hoods, "Hoods V2": hoods_v2, "Poly-Hoods": hoods_poly, "Position-Popup": popuplayer @@ -67,7 +65,7 @@ function update_permalink() { + '&layers=' + (map.hasLayer(routers)|0) + ',' + (map.hasLayer(routers_v2)|0) + ',' + (map.hasLayer(routers_local)|0) + ',' - + (map.hasLayer(hoods)|0) + ',' + + '0,' + (map.hasLayer(hoods_v2)|0) + ',' + (map.hasLayer(hoods_poly)|0) + ',' + (map.hasLayer(popuplayer)|0) @@ -94,7 +92,7 @@ function setupLayers(getargs) { if(getlayers[0]==1) { routers.addTo(map); } if(getlayers[1]==1) { routers_v2.addTo(map); } if(getlayers[2]==1) { routers_local.addTo(map); } - if(getlayers[3]==1) { hoods.addTo(map); } + // getlayers[3] former hoods_v1 unused if(getlayers[4]==1) { hoods_v2.addTo(map); } if(getlayers[5]==1) { hoods_poly.addTo(map); } if(getlayers[6]==1) { popuplayer.addTo(map); } diff --git a/install.sh b/install.sh index b56c2fa..3009bbb 100755 --- a/install.sh +++ b/install.sh @@ -5,9 +5,9 @@ mkdir -vp /var/lib/ffmap/csv chown -R www-data:www-data /var/lib/ffmap mkdir -vp /usr/share/ffmap -cp -v ffmap/mapnik/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml /usr/share/ffmap -sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml -chown www-data:www-data /usr/share/ffmap/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml +cp -v ffmap/mapnik/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml /usr/share/ffmap +sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml +chown www-data:www-data /usr/share/ffmap/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml cp -v ffmap/mapnik/tilestache.cfg /usr/share/ffmap cp -rv ffmap/web/static /usr/share/ffmap