Rename hoodsv2 to hoods_v2 for consistency

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

ffmap/mapnik/hoods_v2.xml

@@ -15,7 +15,7 @@
     <StyleName>hoodborder</StyleName>
     <Datasource>
       <Parameter name="type">csv</Parameter>
-      <Parameter name="file">csv/hoodsv2.csv</Parameter>
+      <Parameter name="file">csv/hoods_v2.csv</Parameter>
     </Datasource>
   </Layer>
   <Layer name="points" srs="+proj=latlong +ellps=WGS84 +datum=WGS84 +no_defs">

ffmap/mapnik/mkcsv.py

@@ -115,7 +115,7 @@ with open("csv/hood-points-v2.csv", "w", encoding="UTF-8") as csv:
 			hood["name"]
 		))
 
-with open("csv/hoodsv2.csv", "w") as csv:
+with open("csv/hoods_v2.csv", "w") as csv:
 	csv.write("WKT\n")
 	hoods = []
 	with urllib.request.urlopen("http://keyserver.freifunk-franken.de/v2/hoods.php") as url:

ffmap/mapnik/run.sh

@@ -3,6 +3,6 @@
 liteserv.py routers.xml --processes=5 &
 liteserv.py routers_v2.xml -p 8003 --processes=5 &
 liteserv.py hoods.xml -p 8001 --processes=5 &
-liteserv.py hoodsv2.xml -p 8002 --processes=5
+liteserv.py hoods_v2.xml -p 8002 --processes=5
 
 killall liteserv.py

ffmap/mapnik/tilestache.cfg

@@ -34,11 +34,11 @@
 			"metatile": {"buffer": 128},
 			"cache lifespan": 300
 		},
-		"tiles/hoodsv2": {
+		"tiles/hoods_v2": {
 			"provider": {
 				"class": "dynmapnik:DynMapnik",
 				"kwargs": {
-					"mapfile": "/usr/share/ffmap/hoodsv2.xml"
+					"mapfile": "/usr/share/ffmap/hoods_v2.xml"
 				}
 			},
 			"metatile": {"buffer": 128},

ffmap/maptools.py

@@ -195,7 +195,7 @@ def update_mapnik_csv(mysql):
 				hood["name"]
 			))
 
-	with open(os.path.join(CONFIG["csv_dir"], "hoodsv2.csv"), "w") as csv:
+	with open(os.path.join(CONFIG["csv_dir"], "hoods_v2.csv"), "w") as csv:
 		csv.write("WKT\n")
 		hoods = []
 		
@@ -209,7 +209,7 @@ def update_mapnik_csv(mysql):
 
 	# touch mapnik XML files to trigger tilelite watcher
 	touch("/usr/share/ffmap/hoods.xml")
-	touch("/usr/share/ffmap/hoodsv2.xml")
+	touch("/usr/share/ffmap/hoods_v2.xml")
 	touch("/usr/share/ffmap/routers.xml")
 	touch("/usr/share/ffmap/routers_v2.xml")
 

ffmap/web/application.py

@@ -27,7 +27,7 @@ tileurls = {
 	"routers": "/tiles/routers",
 	"routers_v2": "/tiles/routers_v2",
 	"hoods": "/tiles/hoods",
-	"hoodsv2": "/tiles/hoodsv2",
+	"hoods_v2": "/tiles/hoods_v2",
 }
 
 @app.route('/')

ffmap/web/static/js/map.js

@@ -29,7 +29,7 @@ var overlay_config = {
 var routers = new L.TileLayer(tileurls.routers + '/{z}/{x}/{y}.png', overlay_config).addTo(map);
 var routers_v2 = new L.TileLayer(tileurls.routers_v2 + '/{z}/{x}/{y}.png', overlay_config).addTo(map);
 var hoods = new L.TileLayer(tileurls.hoods + '/{z}/{x}/{y}.png', overlay_config);
-var hoodsv2 = new L.TileLayer(tileurls.hoodsv2 + '/{z}/{x}/{y}.png', overlay_config);
+var hoods_v2 = new L.TileLayer(tileurls.hoods_v2 + '/{z}/{x}/{y}.png', overlay_config);
 layersControl = new L.Control.Layers({
 	"openstreetmap.org": tilesosmorg,
 	"openstreetmap.de": tilesosmde,
@@ -38,7 +38,7 @@ layersControl = new L.Control.Layers({
 	"Routers": routers,
 	"Routers v2 und dezentral": routers_v2,
 	"Hoods": hoods,
-	"Hoods v2": hoodsv2
+	"Hoods v2": hoods_v2
 });
 map.addControl(layersControl);
 

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,hoodsv2,routers,routers_v2}.xml /usr/share/ffmap
-sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods,hoodsv2,routers,routers_v2}.xml
-chown www-data:www-data /usr/share/ffmap/{hoods,hoodsv2,routers,routers_v2}.xml
+cp -v ffmap/mapnik/{hoods,hoods_v2,routers,routers_v2}.xml /usr/share/ffmap
+sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods,hoods_v2,routers,routers_v2}.xml
+chown www-data:www-data /usr/share/ffmap/{hoods,hoods_v2,routers,routers_v2}.xml
 
 cp -v ffmap/mapnik/tilestache.cfg /usr/share/ffmap
 cp -rv ffmap/web/static /usr/share/ffmap