htdocs/mapscript.js

@@ -132,7 +132,7 @@ function load_svg(name, url, active=1) {
 }
 
 function load_tiles(name, id) {
-	var satellite = L.tileLayer('https://notsyncing.net/maps.linux-forks.de/tiles/{id}/{z}/{y}/{x}.png', {
+	var satellite = L.tileLayer('https://notsyncing.net/maps.linux-forks.de/tiles/?id={id}&z={z}&x={x}&y={y}', {
 		maxZoom: 14 /*8*/,
 		maxNativeZoom: 6,
 		minNativeZoom: 0,

htdocs/tiles/index.php

@@ -0,0 +1,3 @@
+<?php
+
+?>

scripts/convert_maps.sh

@@ -41,7 +41,7 @@ while true; do
 	fi
 
 	echo "  Generating tiles..."
-	convert $tempfile -crop ${TILESIZE}x${TILESIZE} +adjoin $out/%d.png
+	convert $tempfile -crop ${TILESIZE}x${TILESIZE} +adjoin $out/%05d.png
 	
 	rm $tempfile
 	
@@ -51,16 +51,3 @@ while true; do
 	crop=$(($crop * 2))
 	zoom=$(($zoom + 1))
 done;
-
-echo "Renaming files..."
-for (( z=0; z<=$zoom; z++ )) {
-	echo "Zoom level $z"
-	fac=$((2**$z))
-	for (( y=0; y<$fac; y++ )) {
-		outdir="$MAPNAME/$z/$y"
-		mkdir $outdir
-		for (( x=0; x<$fac; x++ )) {
-			mv $MAPNAME/$z/$(($fac * y + $x)).png $outdir/$x.png
-		}
-	}
-}

scripts/geojson/fetch_city_outlines.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-json=`curl 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Cities'`
-data=`echo $json | json_reformat | sed -e 's/\\\\n//g' -n -e 's/begin:mapdata\([^}]\+\)/\1/gp' | sed -e "s/|-|/}/g"`
-
-echo "["
-export IFS="}"
-for entry in $data; do
-	name=`echo $entry | sed -n 's/\s*\([^|]\+\).*/\1/p' | sed 's/ $//'`
-	type=`echo $entry | sed -n 's/\s*\([^|]\+\)||\s*\([^|]\+\).*/\2/p' | sed 's/ $//'`
-	coord=`echo $entry | sed -n 's/.*||\s*\([^|]\+\).*/\1/p'`
-	if [[ "$name" != "" && "$coord" != "" ]]; then
-		echo "{ \"type\": \"Feature\",
-	\"geometry\": {
-		\"type\": \"Polygon\",
-		\"coordinates\": [[
-			$coord
-		]]
-	},
-	\"properties\": {
-		\"name\": \"$name\",
-		\"type\": \"$type\"
-	}
-},"
-	fi
-done
-export IFS=" "
-echo "{}"
-echo "]"