From 7485ce5aaa10ef0b0c22cac99911f8af14a61f68 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 19 Oct 2014 12:25:42 +0200
Subject: Get projects list from new taginfo-projects directory.

---
 projects/osm-mug.json             | 237 --------------------------------------
 projects/osm-mug.png              | Bin 530 -> 0 bytes
 sources/projects/project_list.txt |  18 ---
 sources/projects/update.sh        |  11 +-
 4 files changed, 10 insertions(+), 256 deletions(-)
 delete mode 100644 projects/osm-mug.json
 delete mode 100644 projects/osm-mug.png
 delete mode 100644 sources/projects/project_list.txt

diff --git a/projects/osm-mug.json b/projects/osm-mug.json
deleted file mode 100644
index 58f3746..0000000
--- a/projects/osm-mug.json
+++ /dev/null
@@ -1,237 +0,0 @@
-{
-    "data_format": 1,
-    "data_url": "https://raw.githubusercontent.com/joto/taginfo/master/projects/osm-mug.json",
-    "project": {
-        "name": "OpenStreetMap Mug",
-        "description": "The OSM Cheat Mug contains many of the most important OSM tags.",
-        "project_url": "http://shop.kernelconcepts.de/product_info.php?products_id=112",
-        "doc_url": "http://shop.kernelconcepts.de/images/osm-mug-preview.png",
-        "icon_url": "https://raw.githubusercontent.com/joto/taginfo/master/projects/osm-mug.png",
-        "contact_name": "Jochen Topf",
-        "contact_email": "jochen@remote.org"
-    },
-    "tags": [
-        { "key": "highway", "value": "motorway", "object_types": [ "way" ] },
-        { "key": "highway", "value": "motorway_link", "object_types": [ "way" ] },
-        { "key": "highway", "value": "trunk", "object_types": [ "way" ] },
-        { "key": "highway", "value": "trunk_link", "object_types": [ "way" ] },
-        { "key": "highway", "value": "primary", "object_types": [ "way" ] },
-        { "key": "highway", "value": "primary_link", "object_types": [ "way" ] },
-        { "key": "highway", "value": "secondary", "object_types": [ "way" ] },
-        { "key": "highway", "value": "tertiary", "object_types": [ "way" ] },
-        { "key": "highway", "value": "unclassified", "object_types": [ "way" ] },
-        { "key": "highway", "value": "residential", "object_types": [ "way" ] },
-        { "key": "highway", "value": "living_street", "object_types": [ "way" ] },
-        { "key": "highway", "value": "pedestrian", "object_types": [ "way" ] },
-        { "key": "highway", "value": "service", "object_types": [ "way" ] },
-        { "key": "highway", "value": "cycleway", "object_types": [ "way" ] },
-        { "key": "highway", "value": "footway", "object_types": [ "way" ] },
-        { "key": "highway", "value": "steps", "object_types": [ "way" ] },
-        { "key": "highway", "value": "path", "object_types": [ "way" ] },
-        { "key": "highway", "value": "track", "object_types": [ "way" ] },
-
-        { "key": "highway", "value": "bus_stop", "object_types": [ "node" ] },
-        { "key": "highway", "value": "traffic_signals", "object_types": [ "node" ] },
-        { "key": "highway", "value": "turning_circle", "object_types": [ "node" ] },
-        { "key": "highway", "value": "mini_roundabout", "object_types": [ "node" ] },
-        { "key": "highway", "value": "motorway_junction", "object_types": [ "node" ] },
-
-        { "key": "railway", "value": "rail", "object_types": [ "way" ] },
-        { "key": "railway", "value": "light_rail", "object_types": [ "way" ] },
-        { "key": "railway", "value": "subway", "object_types": [ "way" ] },
-        { "key": "railway", "value": "tram", "object_types": [ "way" ] },
-
-        { "key": "railway", "value": "station", "object_types": [ "node" ] },
-        { "key": "railway", "value": "halt", "object_types": [ "node" ] },
-        { "key": "railway", "value": "tram_stop", "object_types": [ "node" ] },
-
-        { "key": "tracktype", "value": "grade1", "object_types": [ "way" ], "description": "sealed" },
-        { "key": "tracktype", "value": "grade2", "object_types": [ "way" ] },
-        { "key": "tracktype", "value": "grade3", "object_types": [ "way" ], "description": "packed dirt" },
-        { "key": "tracktype", "value": "grade4", "object_types": [ "way" ] },
-        { "key": "tracktype", "value": "grade5", "object_types": [ "way" ], "description": "untreated" },
-
-        { "key": "barrier", "value": "bollard", "object_types": [ "node" ] },
-        { "key": "barrier", "value": "gate", "object_types": [ "node" ] },
-        { "key": "barrier", "value": "lift_gate", "object_types": [ "node" ] },
-        { "key": "barrier", "value": "cycle_barrier", "object_types": [ "node" ] },
-
-        { "key": "barrier", "value": "fence", "object_types": [ "way" ] },
-        { "key": "barrier", "value": "wall", "object_types": [ "way" ] },
-
-        { "key": "name" },
-        { "key": "loc_name" },
-        { "key": "int_name" },
-        { "key": "ref" },
-
-        { "key": "access", "value": "yes" },
-        { "key": "access", "value": "no" },
-        { "key": "access", "value": "permissive" },
-        { "key": "access", "value": "destination" },
-        { "key": "access", "value": "agricultural" },
-        { "key": "access", "value": "forestry" },
-
-        { "key": "foot", "value": "yes" },
-        { "key": "foot", "value": "no" },
-        { "key": "foot", "value": "permissive" },
-        { "key": "foot", "value": "destination" },
-        { "key": "foot", "value": "agricultural" },
-        { "key": "foot", "value": "forestry" },
-
-        { "key": "bicycle", "value": "yes" },
-        { "key": "bicycle", "value": "no" },
-        { "key": "bicycle", "value": "permissive" },
-        { "key": "bicycle", "value": "destination" },
-        { "key": "bicycle", "value": "agricultural" },
-        { "key": "bicycle", "value": "forestry" },
-
-        { "key": "horse", "value": "yes" },
-        { "key": "horse", "value": "no" },
-        { "key": "horse", "value": "permissive" },
-        { "key": "horse", "value": "destination" },
-        { "key": "horse", "value": "agricultural" },
-        { "key": "horse", "value": "forestry" },
-
-        { "key": "motorcar", "value": "yes" },
-        { "key": "motorcar", "value": "no" },
-        { "key": "motorcar", "value": "permissive" },
-        { "key": "motorcar", "value": "destination" },
-        { "key": "motorcar", "value": "agricultural" },
-        { "key": "motorcar", "value": "forestry" },
-
-        { "key": "waterway", "value": "riverbank" },
-        { "key": "waterway", "value": "river" },
-        { "key": "waterway", "value": "canal" },
-        { "key": "waterway", "value": "stream" },
-        { "key": "waterway", "value": "ditch" },
-
-        { "key": "place", "value": "city", "object_types": [ "node" ] },
-        { "key": "place", "value": "suburb", "object_types": [ "node" ] },
-        { "key": "place", "value": "town", "object_types": [ "node" ] },
-        { "key": "place", "value": "village", "object_types": [ "node" ] },
-        { "key": "place", "value": "hamlet", "object_types": [ "node" ] },
-        { "key": "place", "value": "locality", "object_types": [ "node" ] },
-
-        { "key": "addr:street" },
-        { "key": "addr:housenumber" },
-        { "key": "addr:postcode" },
-        { "key": "addr:city" },
-        { "key": "addr:country" },
-        { "key": "addr:interpolation" },
-
-        { "key": "landuse", "value": "farmland", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "farmyard", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "vineyard", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "allotments", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "cemetery", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "forest", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "meadow", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "residential", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "retail", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "commercial", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "industrial", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "construction", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "quarry", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "landfill", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "basin", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "reservoir", "object_types": [ "area" ] },
-        { "key": "landuse", "value": "military", "object_types": [ "area" ] },
-
-        { "key": "natural", "value": "wood", "object_types": [ "area" ] },
-        { "key": "natural", "value": "scrub", "object_types": [ "area" ] },
-        { "key": "natural", "value": "heath", "object_types": [ "area" ] },
-        { "key": "natural", "value": "cliff", "object_types": [ "area" ] },
-        { "key": "natural", "value": "water", "object_types": [ "area" ] },
-        { "key": "natural", "value": "beach", "object_types": [ "area" ] },
-        { "key": "natural", "value": "wetland", "object_types": [ "area" ] },
-
-        { "key": "natural", "value": "peak", "object_types": [ "node" ] },
-        { "key": "natural", "value": "volcano", "object_types": [ "node" ] },
-        { "key": "natural", "value": "spring", "object_types": [ "node" ] },
-        { "key": "natural", "value": "cave_entrance", "object_types": [ "node" ] },
-        { "key": "natural", "value": "tree", "object_types": [ "node" ] },
-
-        { "key": "leisure", "value": "stadium", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "sports_centre", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "pitch", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "track", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "golf_course", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "park", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "playground", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "water_park", "object_types": [ "area" ] },
-        { "key": "leisure", "value": "marina", "object_types": [ "area" ] },
-
-        { "key": "amenity", "value": "restaurant", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "cafe", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "beergarten", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "fast_food", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "pub", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "taxi", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "bus_station", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "post_office", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "police", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "fire_station", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "theatre", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "cinema", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "library", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "telephone", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "post_box", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "toilets", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "shelter", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "recycling", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "fountain", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "bench", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "atm", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "bank", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "hospital", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "doctors", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "dentist", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "pharmacy", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "townhall", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "courthouse", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "public_building", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "place_of_worship", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "grave_yard", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "university", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "school", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "kindergarten", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "parking", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "car_rental", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "fuel", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "bicycle_parking", "object_types": [ "node", "area" ] },
-        { "key": "amenity", "value": "bicycle_rental", "object_types": [ "node", "area" ] },
-
-        { "key": "tourism", "value": "hotel" },
-        { "key": "tourism", "value": "motel" },
-        { "key": "tourism", "value": "guest_house" },
-        { "key": "tourism", "value": "hostel" },
-        { "key": "tourism", "value": "camp_site" },
-        { "key": "tourism", "value": "picnic_site" },
-        { "key": "tourism", "value": "information" },
-        { "key": "tourism", "value": "attraction" },
-        { "key": "tourism", "value": "view_point" },
-        { "key": "tourism", "value": "artwork" },
-        { "key": "tourism", "value": "museum" },
-        { "key": "tourism", "value": "theme_park" },
-        { "key": "tourism", "value": "zoo" },
-
-        { "key": "shop", "value": "clothes", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "shoes", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "hairdresser", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "chemist", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "florist", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "furniture", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "books", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "electronics", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "doityourself", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "bicycle", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "car", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "car_repair", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "supermarket", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "convenience", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "beverages", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "bakery", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "butcher", "object_types": [ "node", "area" ] },
-        { "key": "shop", "value": "kiosk", "object_types": [ "node", "area" ] }
-    ]
-}
diff --git a/projects/osm-mug.png b/projects/osm-mug.png
deleted file mode 100644
index 161f22a..0000000
Binary files a/projects/osm-mug.png and /dev/null differ
diff --git a/sources/projects/project_list.txt b/sources/projects/project_list.txt
deleted file mode 100644
index 0386bed..0000000
--- a/sources/projects/project_list.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-bano http://bano.openstreetmap.fr/bano_taginfo.json
-id_editor https://raw.githubusercontent.com/openstreetmap/iD/master/data/taginfo.json
-josm_main_mappaint_style http://josm.openstreetmap.de/download/taginfo/taginfo_style.json
-maxheight_map https://raw.githubusercontent.com/mmd-osm/osm-maxheight-map/master/taginfo.json
-nominatim http://nominatim.openstreetmap.org/taginfo.json
-opensnowmap_org http://www.opensnowmap.org/opensnowmap_taginfo.json
-osm24eu http://osm24.eu/taginfo.json
-osm_inspector_public_transport_railways http://tools.geofabrik.de/osmi/osmi_pubtrans_railways.json
-osm_inspector_public_transport_stops http://tools.geofabrik.de/osmi/osmi_pubtrans_stops.json
-osm_mug https://raw.githubusercontent.com/joto/taginfo/master/projects/osm-mug.json
-osmcoastline https://raw.githubusercontent.com/joto/osmcoastline/master/taginfo.json
-osmhydrant http://www.osmhydrant.org/taginfo.json
-osrm https://raw.githubusercontent.com/Project-OSRM/osrm-backend/develop/taginfo.json
-townlands_ie http://www.townlands.ie/taginfo.json
-unterkunftskarte http://unterkunftskarte.de/unterkunftskarte.json
-vespucci https://osmeditor4android.googlecode.com/svn/trunk/taginfo.json
-waymarkedtrails http://mapstatic.waymarkedtrails.org/taginfo.json
-wikidata_org http://tools.wmflabs.org/wp-world/wikidata/tags.php
diff --git a/sources/projects/update.sh b/sources/projects/update.sh
index 6c05ac9..b652fae 100755
--- a/sources/projects/update.sh
+++ b/sources/projects/update.sh
@@ -8,7 +8,7 @@
 set -e
 
 DIR=$1
-PROJECT_LIST=project_list.txt
+PROJECT_LIST=$DIR/taginfo-projects/project_list.txt
 
 DATECMD='date +%Y-%m-%dT%H:%M:%S'
 
@@ -29,6 +29,15 @@ DATABASE=$DIR/taginfo-projects.db
 
 rm -f $DATABASE
 
+echo "`$DATECMD` Updating projects list..."
+if [ -d $DIR/taginfo-projects ]; then
+    cd $DIR/taginfo-projects
+    git pull
+    cd -
+else
+    git clone https://github.com/joto/taginfo-projects.git $DIR/taginfo-projects
+fi
+
 echo "`$DATECMD` Running init.sql..."
 sqlite3 $DATABASE <../init.sql
 
-- 
cgit v1.2.3