From c2bf9630afaeffc02776040576d68d9a009feeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Fri, 28 Feb 2020 00:28:43 +0100 Subject: [PATCH] Sort the maps properly by map name --- index.html | 58 +++++++++++++++++++++++------------------------ scripts/mapgen.py | 9 +++++--- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/index.html b/index.html index acb74f0..5581af3 100644 --- a/index.html +++ b/index.html @@ -21,26 +21,26 @@ use it in GPXSee.

Map Preview
4UMaps Map Preview
CyclOSM -Map Preview
HikeBikeMap -Map Preview
MapTiler - -Map Preview
ÖPNVKarte -Map Preview
Open Street Map - Black and White -Map Preview
Open Street Map - HiDPI -Map Preview
Open Street Map - -Map Preview
Open Topo Map -Map Preview
Thunderforest - Landscape -Map Preview
Thunderforest - OpenCycleMap -Map Preview
Thunderforest - Outdoors - -Map Preview
Thunderforest - Transport Map Preview
GIScience Heidelberg Map Preview
HERE Aerial Map + Map Preview
HERE Base Map +Map Preview
HikeBikeMap +Map Preview
MapTiler +Map Preview
Open Street Map + +Map Preview
Open Street Map - Black and White +Map Preview
Open Street Map - HiDPI +Map Preview
Open Topo Map +Map Preview
Thunderforest - Landscape + +Map Preview
Thunderforest - OpenCycleMap +Map Preview
Thunderforest - Outdoors +Map Preview
Thunderforest - Transport +Map Preview
UNESCO Map Preview
marshruty.ru -Map Preview
UNESCO +Map Preview
ÖPNVKarte

Antarctica

@@ -99,10 +99,10 @@ use it in GPXSee.

Czech Republic

- - + +
Map Preview
ČÚZK - Ortofoto		Map Preview
ČÚZK - Základní mapy		 Map Preview
Poloha.Net		 Map Preview
Prahou na kole		Map Preview
ČÚZK - Ortofoto		Map Preview
ČÚZK - Základní mapy

Finland

@@ -131,9 +131,9 @@ use it in GPXSee.

Map Preview
Bayern DOP Map Preview
Berlin DOP Map Preview
Hamburg DOP -Map Preview
Sachsen-Anhalt DOP - Map Preview
Sachsen DOP + +Map Preview
Sachsen-Anhalt DOP Map Preview
TopPlusOpen @@ -162,31 +162,31 @@ use it in GPXSee.

- - - + + +
Map Preview
Jan Mayen Topography		Map Preview
Topografisk Norgeskart		Map Preview
Svalbard Topography		 Map Preview
Svalbard Orthophoto
Map Preview
Svalbard Satellite Imagery		Map Preview
Svalbard Topography
Map Preview
Topografisk Norgeskart

Poland

- +
Map Preview
GUGIK Ortofotomapa		 Map Preview
GUGIK Mapa Topograficzna		Map Preview
GUGIK Ortofotomapa		 Map Preview
UMP-pcPL

Russian Federation

- - - + + + @@ -198,8 +198,8 @@ use it in GPXSee.

Map Preview
Races		 Map Preview
GGC 1km		Map Preview
GGC 2km		 Map Preview
GGC 250m
Map Preview
GGC 2km		 Map Preview
GGC 500m
Map Preview
O-sport		Map Preview
Races		 Map Preview
Slazav map		 Map Preview
Topo 1km
- +
Map Preview
Freemap Slovakia		Map Preview
GKÚ - ZBGIS		 Map Preview
GKÚ - Ortofotomozaika		Map Preview
GKÚ - ZBGIS

Slovenia

@@ -219,10 +219,10 @@ use it in GPXSee.

Switzerland

- - + +
Map Preview
OSM Switzerland Swiss Style		 Map Preview
OSM Switzerland		Map Preview
Swisstopo Aerial		Map Preview
OSM Switzerland Swiss Style		 Map Preview
Swisstopo		Map Preview
Swisstopo Aerial

North America

diff --git a/scripts/mapgen.py b/scripts/mapgen.py index d81a1b0..e5e1dc4 100755 --- a/scripts/mapgen.py +++ b/scripts/mapgen.py @@ -298,11 +298,14 @@ def mapinfo(xmlfile): def processmaps(maps, htmlfile): htmlfile.write("\n\n") - i = 0 - maps.sort() + items = [] for xmlfile in maps: shutil.copyfile(xmlfile, "../maps/" + os.path.basename(xmlfile)) - info = mapinfo(xmlfile) + items.append(mapinfo(xmlfile)) + items.sort(key=lambda tup: tup["name"]) + + i = 0 + for info in items: if i and i % 4 == 0: htmlfile.write("\n") htmlfile.write("
" + "