Skip to content

Update map sources #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndiPersti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update map sources #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions data/maps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
</object>
<object class="VikSlippyMapSource">
<property name="label">Public Transport Map</property>
<property name="hostname">https://tile.xn--pnvkarte-m4a.de</property>
<property name="url">/tilegen/%0d/%d/%d.png</property>
<property name="hostname">https://tile.memomaps.de</property>
<property name="url">/tilegen/%d/%d/%d.png</property>
<property name="follow-location">2</property>
<property name="zoom-min">0</property>
<property name="zoom-max">18</property>
Expand Down Expand Up @@ -158,16 +158,6 @@
<property name="license">CC-by-SA 3.0 / ODBl</property>
<property name="license-url">https://creativecommons.org/licenses/by-sa/3.0/de/deed.en</property>
</object>
<object class="VikSlippyMapSource">
<property name="name">4UMaps</property>
<property name="label">4UMaps</property>
<property name="hostname">https://tileserver.4umaps.eu</property>
<property name="url">/%d/%d/%d.png</property>
<property name="copyright">© 4UMaps.eu © OpenStreetMap and contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">https://www.4umaps.eu/terms-of-use-copyright.aspx</property>
<property name="id">801</property>
</object>
<!-- Built in - osm.c
<object class="VikSlippyMapSource">
<property name="name">OpenTopoMap</property>
Expand Down
2 changes: 1 addition & 1 deletion src/map_ids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#define MAP_ID_BLUE_MARBLE 15
#define MAP_ID_OSM_CYCLE 17
//#define MAP_ID_MAPQUEST_OSM 19 // Tile Service discontinued
#define MAP_ID_OSM_TRANSPORT 20
//#define MAP_ID_OSM_TRANSPORT 20 // requires API key
#define MAP_ID_OSM_ON_DISK 21
#define MAP_ID_OSM_HUMANITARIAN 22
#define MAP_ID_MBTILES 23
Expand Down
15 changes: 0 additions & 15 deletions src/osm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,6 @@ void osm_init () {
"license", "CC-BY-SA",
"license-url", "https://www.openstreetmap.org/copyright",
NULL));
VikMapSource *transport_type =
VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
"id", MAP_ID_OSM_TRANSPORT,
"label", _("OpenStreetMap (Transport)"),
"name", "OSM-Transport",
"url", "https://tile2.opencyclemap.org/transport/%d/%d/%d.png",
"check-file-server-time", TRUE,
"use-etag", FALSE,
"zoom-min", 0,
"zoom-max", 18,
"copyright", "Tiles courtesy of Andy Allan © OpenStreetMap contributors",
"license", "CC-BY-SA",
"license-url", "https://www.openstreetmap.org/copyright",
NULL));
VikMapSource *hot_type =
VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
"id", MAP_ID_OSM_HUMANITARIAN,
Expand Down Expand Up @@ -154,7 +140,6 @@ void osm_init () {
// (unless the user has specified Map Layer defaults)
maps_layer_register_map_source (mapnik_type); g_object_unref ( mapnik_type );
maps_layer_register_map_source (cycle_type); g_object_unref ( cycle_type );
maps_layer_register_map_source (transport_type); g_object_unref ( transport_type );
maps_layer_register_map_source (hot_type); g_object_unref ( hot_type );
maps_layer_register_map_source (open_topo_type); g_object_unref ( open_topo_type );
maps_layer_register_map_source (direct_type); g_object_unref ( direct_type );
Expand Down