From a1c50a3cfb61d4268518b08ec84b77c4dbca643b Mon Sep 17 00:00:00 2001
From: Markus Koch <markus@notsyncing.net>
Date: Sun, 26 Apr 2020 17:28:28 +0200
Subject: Move Maps:-based scripts to separate directory

---
 scripts/geojson/fetch_city_outlines.sh      | 29 -----------------------------
 scripts/geojson/fetch_streets.sh            | 29 -----------------------------
 scripts/geojson/maps/fetch_city_outlines.sh | 29 +++++++++++++++++++++++++++++
 scripts/geojson/maps/fetch_streets.sh       | 29 +++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100755 scripts/geojson/fetch_city_outlines.sh
 delete mode 100755 scripts/geojson/fetch_streets.sh
 create mode 100755 scripts/geojson/maps/fetch_city_outlines.sh
 create mode 100755 scripts/geojson/maps/fetch_streets.sh

diff --git a/scripts/geojson/fetch_city_outlines.sh b/scripts/geojson/fetch_city_outlines.sh
deleted file mode 100755
index c9c2b58..0000000
--- a/scripts/geojson/fetch_city_outlines.sh
+++ /dev/null
@@ -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 "]"
diff --git a/scripts/geojson/fetch_streets.sh b/scripts/geojson/fetch_streets.sh
deleted file mode 100755
index 741f82a..0000000
--- a/scripts/geojson/fetch_streets.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# WARNING: This script is not yet production ready. The slightest error in the wikipage can throw it off. Handle with care.
-
-json=`curl 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Streets'`
-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/ $//'`
-	coord=`echo "$entry" | sed -n 's/.*||\s*\([^|]\+\).*/\1/p'`
-	if [[ "$name" != "" && "$coord" != "" ]]; then
-		echo "{ \"type\": \"Feature\",
-	\"geometry\": {
-		\"type\": \"LineString\",
-		\"coordinates\": [
-			$coord
-		]
-	},
-	\"properties\": {
-		\"name\": \"$name\"
-	}
-},"
-	fi
-done
-export IFS=" "
-echo "{}"
-echo "]"
diff --git a/scripts/geojson/maps/fetch_city_outlines.sh b/scripts/geojson/maps/fetch_city_outlines.sh
new file mode 100755
index 0000000..c9c2b58
--- /dev/null
+++ b/scripts/geojson/maps/fetch_city_outlines.sh
@@ -0,0 +1,29 @@
+#!/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 "]"
diff --git a/scripts/geojson/maps/fetch_streets.sh b/scripts/geojson/maps/fetch_streets.sh
new file mode 100755
index 0000000..741f82a
--- /dev/null
+++ b/scripts/geojson/maps/fetch_streets.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# WARNING: This script is not yet production ready. The slightest error in the wikipage can throw it off. Handle with care.
+
+json=`curl 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Streets'`
+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/ $//'`
+	coord=`echo "$entry" | sed -n 's/.*||\s*\([^|]\+\).*/\1/p'`
+	if [[ "$name" != "" && "$coord" != "" ]]; then
+		echo "{ \"type\": \"Feature\",
+	\"geometry\": {
+		\"type\": \"LineString\",
+		\"coordinates\": [
+			$coord
+		]
+	},
+	\"properties\": {
+		\"name\": \"$name\"
+	}
+},"
+	fi
+done
+export IFS=" "
+echo "{}"
+echo "]"
-- 
cgit v1.2.3