From a30eff0c1417b80b51b2ecc8152faed702c73e98 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Sat, 9 Dec 2017 15:55:28 -0600 Subject: [PATCH 1/9] pick network order following continents and countries --- app/build.gradle | 4 +- .../PickTransportNetworkActivityTest.kt | 4 +- .../grobox/transportr/networks/Continent.java | 58 +++++++ .../transportr/networks/ContinentItem.java | 82 ++++++++++ .../networks/ContinentViewHolder.java | 38 +++++ .../grobox/transportr/networks/Country.java | 82 ++++++++++ .../transportr/networks/CountryItem.java | 79 ++++++++++ .../networks/CountryViewHolder.java | 54 +++++++ .../PickTransportNetworkActivity.java | 113 +++++++++++-- .../de/grobox/transportr/networks/Region.java | 61 +------- .../transportr/networks/RegionItem.java | 82 ++++------ .../transportr/networks/RegionViewHolder.java | 33 ++-- .../transportr/networks/TransportNetwork.java | 3 +- .../networks/TransportNetworkItem.java | 14 +- .../networks/TransportNetworkViewHolder.java | 10 +- .../networks/TransportNetworks.java | 148 +++++++++--------- .../activity_pick_transport_network.xml | 2 +- .../layout/list_item_transport_continent.xml | 52 ++++++ ...on.xml => list_item_transport_country.xml} | 4 +- app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 11 +- app/src/main/res/values-eo/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 13 +- app/src/main/res/values-eu/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 6 +- app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 4 - app/src/main/res/values-ta/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values/strings.xml | 14 +- 36 files changed, 712 insertions(+), 305 deletions(-) create mode 100644 app/src/main/java/de/grobox/transportr/networks/Continent.java create mode 100644 app/src/main/java/de/grobox/transportr/networks/ContinentItem.java create mode 100644 app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java create mode 100644 app/src/main/java/de/grobox/transportr/networks/Country.java create mode 100644 app/src/main/java/de/grobox/transportr/networks/CountryItem.java create mode 100644 app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java create mode 100644 app/src/main/res/layout/list_item_transport_continent.xml rename app/src/main/res/layout/{list_item_transport_region.xml => list_item_transport_country.xml} (96%) diff --git a/app/build.gradle b/app/build.gradle index 29e8a55c5..4bcf66c57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,8 +113,8 @@ dependencies { implementation 'com.google.android:flexbox:0.3.1' implementation 'com.mikepenz:materialdrawer:6.0.0' implementation 'com.mikepenz:aboutlibraries:6.0.0' - implementation 'com.mikepenz:fastadapter-commons:3.0.3@aar' - implementation 'com.mikepenz:fastadapter-extensions-expandable:3.0.3@aar' + implementation 'com.mikepenz:fastadapter-commons:3.0.5@aar' + implementation 'com.mikepenz:fastadapter-extensions-expandable:3.0.5@aar' implementation 'uk.co.samuelwall:material-tap-target-prompt:2.1.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.3.0' diff --git a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt index bf0aa9ce6..9c36d585e 100644 --- a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt +++ b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt @@ -74,13 +74,13 @@ class PickTransportNetworkActivityTest : ScreengrabTest() { makeScreenshot("1_FirstStart") // hack to find region position in list - val regionList = ArrayList(EnumSet.allOf(Region::class.java)) + val regionList = ArrayList(EnumSet.allOf(Country::class.java)) //TODO: pretty sure it will break :/ val context = InstrumentationRegistry.getTargetContext() Collections.sort(regionList) { r1, r2 -> context.getString(r1.getName()).compareTo(context.getString(r2.getName())) } // select DB network provider onView(withId(R.id.list)) - .perform(scrollToPosition(regionList.indexOf(Region.GERMANY) + 5)) + .perform(scrollToPosition(regionList.indexOf(Country.GERMANY) + 5)) .perform(actionOnItem(withChild(withText(R.string.np_region_germany)), click())) .perform(actionOnItem(withChild(withText(R.string.np_name_db)), click())) } diff --git a/app/src/main/java/de/grobox/transportr/networks/Continent.java b/app/src/main/java/de/grobox/transportr/networks/Continent.java new file mode 100644 index 000000000..b513d5f91 --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/Continent.java @@ -0,0 +1,58 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.content.Context; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; + +import javax.annotation.ParametersAreNonnullByDefault; + +import de.grobox.transportr.R; + +@ParametersAreNonnullByDefault +enum Continent implements Region { + + EUROPE(R.string.np_continent_europe), + AFRICA(R.string.np_continent_africa), + NORTH_AMERICA(R.string.np_continent_north_america), + CENTRAL_AMERICA(R.string.np_continent_central_america), + SOUTH_AMERICA(R.string.np_continent_south_america), + ASIA(R.string.np_continent_asia), + OCEANIA(R.string.np_continent_oceania); + + + private final @StringRes int name; + + Continent(@StringRes int name) { + this.name = name; + } + + @StringRes + public int getName() { + return name; + } + + @Override + public String getName(Context context) { + return context.getString(name); + } + +} diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java new file mode 100644 index 000000000..639c1c9d2 --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java @@ -0,0 +1,82 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.content.Context; +import android.support.annotation.IdRes; +import android.support.annotation.LayoutRes; +import android.support.v4.view.ViewCompat; +import android.view.View; + +import com.mikepenz.fastadapter.IItem; +import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem; +import com.mikepenz.fastadapter.listeners.OnClickListener; + +import java.util.Comparator; +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + +import de.grobox.transportr.R; + +@ParametersAreNonnullByDefault +class ContinentItem extends ParentRegionItem { + + private final Continent continent; + + ContinentItem(Continent continent) { + super(); + this.continent = continent; + } + + @Override + protected String getName(Context context) { + return this.continent.getName(context); + } + + @IdRes + @Override + public int getType() { + return R.id.list_item_transport_continent; + } + + @Override + @LayoutRes + public int getLayoutRes() { + return R.layout.list_item_transport_continent; + } + + @Override + public void bindView(RegionViewHolder ui, List payloads) { + super.bindView(ui, payloads); + ui.bind(continent, isExpanded()); + } + + @Override + public ContinentViewHolder getViewHolder(View view) { + return new ContinentViewHolder(view); + } + + @Override + public long getIdentifier() { + return continent.getName(); + } + +} diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java new file mode 100644 index 000000000..0b74da17c --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java @@ -0,0 +1,38 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.os.Build; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import de.grobox.transportr.R; + +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + +class ContinentViewHolder extends ParentRegionViewHolder { + + ContinentViewHolder(View v) { + super(v); + } +} diff --git a/app/src/main/java/de/grobox/transportr/networks/Country.java b/app/src/main/java/de/grobox/transportr/networks/Country.java new file mode 100644 index 000000000..a3c984009 --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/Country.java @@ -0,0 +1,82 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.content.Context; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; + +import javax.annotation.ParametersAreNonnullByDefault; + +import de.grobox.transportr.R; + +@ParametersAreNonnullByDefault +enum Country implements Region { + + GERMANY(R.string.np_region_germany, "🇩🇪", Continent.EUROPE), + AUSTRIA(R.string.np_region_austria, "🇦🇹", Continent.EUROPE), + LIECHTENSTEIN(R.string.np_region_liechtenstein, "🇱🇮", Continent.EUROPE), + SWITZERLAND(R.string.np_region_switzerland, "🇨🇭", Continent.EUROPE), + LUXEMBOURG(R.string.np_region_luxembourg, "🇱🇺", Continent.EUROPE), + NETHERLANDS(R.string.np_region_netherlands, "🇳🇱", Continent.EUROPE), + DENMARK(R.string.np_region_denmark, "🇩🇰", Continent.EUROPE), + SWEDEN(R.string.np_region_sweden, "🇸🇪", Continent.EUROPE), + NORWAY(R.string.np_region_norway, "🇳🇴", Continent.EUROPE), + FINLAND(R.string.np_region_finland, "🇫🇮", Continent.EUROPE), + GREAT_BRITAIN(R.string.np_region_gb, "🇬🇧", Continent.EUROPE), + IRELAND(R.string.np_region_ireland, "🇮🇪", Continent.EUROPE), + POLAND(R.string.np_region_poland, "🇵🇱", Continent.EUROPE), + UAE(R.string.np_region_uae, "🇦🇪", Continent.ASIA), + USA(R.string.np_region_usa, "🇺🇸", Continent.NORTH_AMERICA), + AUSTRALIA(R.string.np_region_australia, "🇦🇺", Continent.OCEANIA), + FRANCE(R.string.np_region_france, "🇫🇷", Continent.EUROPE), + BRAZIL(R.string.np_region_br, "🇧🇷", Continent.SOUTH_AMERICA), + CANADA(R.string.np_region_canada, "🇨🇦", Continent.NORTH_AMERICA); + + private final @StringRes int name; + private final @Nullable String flag; + private final Continent continent; + + Country(@StringRes int name, @Nullable String flag, Continent continent) { + this.name = name; + this.flag = flag; + this.continent = continent; + } + + @StringRes + public int getName() { + return name; + } + + @Override + public String getName(Context context) { + return context.getString(name); + } + + @Nullable + public String getFlag() { + return flag; + } + + public Continent getContinent() { + return continent; + } + +} diff --git a/app/src/main/java/de/grobox/transportr/networks/CountryItem.java b/app/src/main/java/de/grobox/transportr/networks/CountryItem.java new file mode 100644 index 000000000..338f46c63 --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/CountryItem.java @@ -0,0 +1,79 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.content.Context; +import android.support.annotation.IdRes; +import android.support.annotation.LayoutRes; +import android.support.v4.view.ViewCompat; +import android.view.View; + +import com.mikepenz.fastadapter.listeners.OnClickListener; + +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + +import de.grobox.transportr.R; + +@ParametersAreNonnullByDefault +class CountryItem extends ParentRegionItem { + + protected final Country country; + + CountryItem(Country country) { + super(); + this.country = country; + } + + @Override + protected String getName(Context context) { + return this.country.getName(context); + } + + @IdRes + @Override + public int getType() { + return R.id.list_item_transport_country; + } + + @Override + @LayoutRes + public int getLayoutRes() { + return R.layout.list_item_transport_country; + } + + @Override + public void bindView(RegionViewHolder ui, List payloads) { + super.bindView(ui, payloads); + ui.bind(country, isExpanded()); + } + + @Override + public RegionViewHolder getViewHolder(View view) { + return new CountryViewHolder(view); + } + + @Override + public long getIdentifier() { + return country.getName(); + } + +} diff --git a/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java new file mode 100644 index 000000000..c43b26e3d --- /dev/null +++ b/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java @@ -0,0 +1,54 @@ +/* + * Transportr + * + * Copyright (c) 2013 - 2017 Torsten Grote + * + * This program is Free Software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.grobox.transportr.networks; + +import android.os.Build; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import de.grobox.transportr.R; + +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + +class CountryViewHolder extends ParentRegionViewHolder { + + private final TextView flag; + + CountryViewHolder(View v) { + super(v); + flag = v.findViewById(R.id.flag); + } + + @Override + void bind(Region region, boolean expanded) { + super.bind(region, expanded); + Country country = (Country)region; + if (Build.VERSION.SDK_INT >= 21) { + flag.setText(country.getFlag()); + flag.setVisibility(VISIBLE); + } else { + flag.setVisibility(GONE); + } + } + +} diff --git a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java index 22db9c453..6c6b3a176 100644 --- a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java +++ b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java @@ -23,16 +23,19 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.ActionBar; +import android.support.v7.util.SortedList; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.MenuItem; +import com.google.common.collect.RowSortedTable; import com.mikepenz.fastadapter.IItem; import com.mikepenz.fastadapter.ISelectionListener; import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter; import com.mikepenz.fastadapter.expandable.ExpandableExtension; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,14 +93,40 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { list.setLayoutManager(new LinearLayoutManager(this)); list.setAdapter(adapter); - Map> networksByRegion = getTransportNetworksByRegion(); - for (Region region : networksByRegion.keySet()) { - RegionItem regionItem = new RegionItem(region); - List networks = networksByRegion.get(region); - List networkItems = new ArrayList<>(networks.size()); - for (TransportNetwork n : networks) networkItems.add(new TransportNetworkItem(n)); - regionItem.withSubItems(networkItems); - adapter.add(regionItem); + Map> regions = getRegionsByRegion(); + for (Continent continent : Continent.values()) { + if (!regions.containsKey(continent)) { + continue; + } + ContinentItem continentItem = new ContinentItem(continent); + List subRegions = regions.get(continent); + List subRegionItems = new ArrayList<>(subRegions.size()); + for (Region subRegion : subRegions) { + if (subRegion instanceof Country) { + Country country = (Country)subRegion; + if (!regions.containsKey(country)) { + continue; + } + CountryItem countryItem = new CountryItem(country); + List networks = regions.get(country); + List networkItems = new ArrayList<>(networks.size()); + for (Region network : networks) { + if (!(network instanceof TransportNetwork)) + continue; + networkItems.add(new TransportNetworkItem((TransportNetwork)network)); + } + countryItem.withSubItems(networkItems); + subRegionItems.add(countryItem); + } else if (subRegion instanceof TransportNetwork) { + TransportNetwork network = (TransportNetwork)subRegion; + subRegionItems.add(new TransportNetworkItem(network)); + } + } + + Collections.sort(subRegionItems, new RegionItem.RegionComparator(this)); + continentItem.withSubItems(subRegionItems); + adapter.add(continentItem); + } if (savedInstanceState != null) adapter.withSavedInstanceState(savedInstanceState); @@ -134,9 +163,25 @@ private void selectItem() { selectAllowed = true; return; } - int pos = adapter.getPosition(new RegionItem(network.getRegion())); + int pos = -1; + Region region = network.getRegion(); + Continent continent = null; + Country country = null; + if (region instanceof Country) { + country = (Country)region; + continent = country.getContinent(); + } else if (region instanceof Continent) { + continent = (Continent)region; + } + pos = adapter.getPosition(new ContinentItem(continent)); if (pos != -1) { expandableExtension.expand(pos); + if (country != null) { + pos = adapter.getPosition(new CountryItem(country)); + if (pos != -1) { + expandableExtension.expand(pos); + } + } pos = adapter.getPosition(new TransportNetworkItem(network)); if (pos != -1) { adapter.select(pos, false); @@ -146,19 +191,53 @@ private void selectItem() { } } } + + private HashMap> getRegionsByRegion() { - private HashMap> getTransportNetworksByRegion() { - HashMap> networks = new HashMap<>(); + HashMap> regions = new HashMap<>(); for (TransportNetwork n : TransportNetworks.networks) { - if (networks.containsKey(n.getRegion())) { - networks.get(n.getRegion()).add(n); + Region region = n.getRegion(); + Country country; + Continent continent; + if (region instanceof Country) { + country = (Country)region; + continent = country.getContinent(); + + List countries = new ArrayList<>(); + List networks = new ArrayList<>(); + + if (regions.containsKey(continent)) + countries = regions.get(continent); + if (!countries.contains(country)) + countries.add(country); + if (!regions.containsKey(continent)) + regions.put(continent, countries); + + if (regions.containsKey(country)) { + networks = regions.get(country); + } + networks.add(n); + if (!regions.containsKey(country)) { + regions.put(country, networks); + } + + } else if (region instanceof Continent) { + continent = (Continent)region; + + List networks = new ArrayList<>(); + + if (regions.containsKey(continent)) { + networks = regions.get(continent); + } + networks.add(n); + if (!regions.containsKey(continent)) { + regions.put(continent, networks); + } } else { - List list = new ArrayList<>(); - list.add(n); - networks.put(n.getRegion(), list); + continue; } } - return networks; + return regions; } } diff --git a/app/src/main/java/de/grobox/transportr/networks/Region.java b/app/src/main/java/de/grobox/transportr/networks/Region.java index eaeaa6843..29561a008 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Region.java +++ b/app/src/main/java/de/grobox/transportr/networks/Region.java @@ -20,64 +20,7 @@ package de.grobox.transportr.networks; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; - -import javax.annotation.ParametersAreNonnullByDefault; - -import de.grobox.transportr.R; - -@ParametersAreNonnullByDefault -enum Region { - - EUROPE(R.string.np_region_europe, "🇪🇺"), - GERMANY(R.string.np_region_germany, "🇩🇪"), - AUSTRIA(R.string.np_region_austria, "🇦🇹"), - LIECHTENSTEIN(R.string.np_region_liechtenstein, "🇱🇮"), - SWITZERLAND(R.string.np_region_switzerland, "🇨🇭"), - BELGIUM(R.string.np_region_belgium, "🇧🇪"), - LUXEMBOURG(R.string.np_region_luxembourg, "🇱🇺"), - NETHERLANDS(R.string.np_region_netherlands, "🇳🇱"), - DENMARK(R.string.np_region_denmark, "🇩🇰"), - SWEDEN(R.string.np_region_sweden, "🇸🇪"), - NORWAY(R.string.np_region_norway, "🇳🇴"), - FINLAND(R.string.np_region_finland, "🇫🇮"), - GREAT_BRITAIN(R.string.np_region_gb, "🇬🇧"), - IRELAND(R.string.np_region_ireland, "🇮🇪"), - ITALY(R.string.np_region_italy, "🇮🇹"), - POLAND(R.string.np_region_poland, "🇵🇱"), - UAE(R.string.np_region_uae, "🇦🇪"), - USA(R.string.np_region_usa, "🇺🇸"), - AUSTRALIA(R.string.np_region_australia, "🇦🇺"), - FRANCE(R.string.np_region_france, "🇫🇷"), - NEW_ZEALAND(R.string.np_region_nz, "🇳🇿"), - SPAIN(R.string.np_region_spain, "🇪🇸"), - BRAZIL(R.string.np_region_br, "🇧🇷"), - CANADA(R.string.np_region_canada, "🇨🇦"), - COSTA_RICA(R.string.np_region_costa_rica, "🇨🇷"), - AFRICA(R.string.np_region_africa, "🌍"), - CENTRAL_AMERICA(R.string.np_region_central_america, "🌎"); - - private final @StringRes int name; - private final @Nullable String flag; - - Region(@StringRes int name, @Nullable String flag) { - this.name = name; - this.flag = flag; - } - - @StringRes - public int getName() { - return name; - } - - public String getName(Context context) { - return context.getString(name); - } - - @Nullable - public String getFlag() { - return flag; - } +interface Region { + String getName(Context context); } diff --git a/app/src/main/java/de/grobox/transportr/networks/RegionItem.java b/app/src/main/java/de/grobox/transportr/networks/RegionItem.java index 3fe0080d5..b1f798ed4 100644 --- a/app/src/main/java/de/grobox/transportr/networks/RegionItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/RegionItem.java @@ -26,6 +26,8 @@ import android.view.View; import com.mikepenz.fastadapter.IItem; +import com.mikepenz.fastadapter.adapters.ItemAdapter; +import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter; import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem; import com.mikepenz.fastadapter.listeners.OnClickListener; @@ -37,48 +39,48 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -class RegionItem extends AbstractExpandableItem { +abstract class RegionItem extends AbstractExpandableItem { - private final Region region; + protected abstract String getName(Context context); - RegionItem(Region region) { - super(); - this.region = region; - } - - @IdRes - @Override - public int getType() { - return R.id.list_item_transport_region; - } - - @Override - @LayoutRes - public int getLayoutRes() { - return R.layout.list_item_transport_region; - } + static class RegionComparator implements Comparator { - @Override - public void bindView(RegionViewHolder ui, List payloads) { - super.bindView(ui, payloads); - ui.bind(region, isExpanded()); - } + private final Context context; - @Override - public RegionViewHolder getViewHolder(View view) { - return new RegionViewHolder(view); - } + RegionComparator(Context context) { + super(); + this.context = context; + } - @Override - public long getIdentifier() { - return region.getName(); + @Override + public int compare(IItem i1, IItem i2) { + if (i1 instanceof RegionItem && i2 instanceof RegionItem) { + // sort regions alphabetically + return ((RegionItem) i1).getName(context).compareTo(((RegionItem) i2).getName(context)); + } + return 0; + } } +} +abstract class ParentRegionItem extends RegionItem { + @Override public OnClickListener getOnItemClickListener() { return (v, adapter, item, position) -> { if (item.getSubItems() != null) { if (!item.isExpanded()) { + List subItems = item.getSubItems(); + for (RegionItem subItem : subItems) { + if (subItem.getSubItems() != null && subItem.isExpanded()) { + boolean test = subItem.isExpanded(); + subItem.withIsExpanded(false); + test = subItem.isExpanded(); + subItem.withIsExpanded(false); + test = subItem.isExpanded(); + ((ItemAdapter)adapter).getFastAdapter().notifyAdapterDataSetChanged(); + } + } ViewCompat.animate(v.findViewById(R.id.chevron)).rotation(180).start(); } else { ViewCompat.animate(v.findViewById(R.id.chevron)).rotation(0).start(); @@ -88,24 +90,4 @@ public OnClickListener getOnItemClickListener() { return false; }; } - - static class RegionComparator implements Comparator { - - private final Context context; - - RegionComparator(Context context) { - super(); - this.context = context; - } - - @Override - public int compare(IItem i1, IItem i2) { - if (i1 instanceof RegionItem && i2 instanceof RegionItem) { - // sort regions alphabetically - return ((RegionItem) i1).region.getName(context).compareTo(((RegionItem) i2).region.getName(context)); - } - return 0; - } - } - } diff --git a/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java index 2591a9527..5757e3c07 100644 --- a/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java @@ -19,7 +19,6 @@ package de.grobox.transportr.networks; -import android.os.Build; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; @@ -27,32 +26,30 @@ import de.grobox.transportr.R; -import static android.view.View.GONE; -import static android.view.View.VISIBLE; - -class RegionViewHolder extends RecyclerView.ViewHolder { - - private final TextView flag; - private final TextView name; - private final ImageView chevron; +abstract class RegionViewHolder extends RecyclerView.ViewHolder { + protected final TextView name; RegionViewHolder(View v) { super(v); - flag = v.findViewById(R.id.flag); name = v.findViewById(R.id.name); + } + + void bind(Region region, boolean expanded) { + name.setText(region.getName(name.getContext())); + } +} + +abstract class ParentRegionViewHolder extends RegionViewHolder { + protected final ImageView chevron; + + ParentRegionViewHolder(View v) { + super(v); chevron = v.findViewById(R.id.chevron); } void bind(Region region, boolean expanded) { - if (Build.VERSION.SDK_INT >= 21) { - flag.setText(region.getFlag()); - flag.setVisibility(VISIBLE); - } else { - flag.setVisibility(GONE); - } - name.setText(region.getName()); + super.bind(region, expanded); if (expanded) chevron.setRotation(0); else chevron.setRotation(180); } - } diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java index 787fdd9a7..23f619d2b 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java @@ -34,7 +34,7 @@ @Immutable @ParametersAreNonnullByDefault -public class TransportNetwork { +public class TransportNetwork implements Region { private final NetworkId id; private final Region region; @@ -71,6 +71,7 @@ public Region getRegion() { return region; } + @Override public String getName(Context context) { if (name == 0) { return id.name(); diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java index 6f0276b2e..ed0b1d267 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java @@ -19,6 +19,7 @@ package de.grobox.transportr.networks; +import android.content.Context; import android.support.annotation.IdRes; import android.support.annotation.LayoutRes; import android.view.View; @@ -34,15 +35,20 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -class TransportNetworkItem extends AbstractExpandableItem { +class TransportNetworkItem extends RegionItem { - private final TransportNetwork network; + protected final TransportNetwork network; TransportNetworkItem(TransportNetwork network) { super(); this.network = network; } + @Override + protected String getName(Context context) { + return this.network.getName(context); + } + @IdRes @Override public int getType() { @@ -56,9 +62,9 @@ public int getLayoutRes() { } @Override - public void bindView(TransportNetworkViewHolder ui, List payloads) { + public void bindView(RegionViewHolder ui, List payloads) { super.bindView(ui, payloads); - ui.bind(network); + ui.bind(network, false); } @Override diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java index 87bfa7d65..32f3ff425 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java @@ -31,24 +31,24 @@ import static de.grobox.transportr.networks.TransportNetwork.Status.ALPHA; import static de.grobox.transportr.networks.TransportNetwork.Status.STABLE; -class TransportNetworkViewHolder extends RecyclerView.ViewHolder { +class TransportNetworkViewHolder extends RegionViewHolder { private final ImageView logo; - private final TextView name; private final TextView desc; private final TextView status; TransportNetworkViewHolder(View v) { super(v); logo = v.findViewById(R.id.logo); - name = v.findViewById(R.id.name); desc = v.findViewById(R.id.desc); status = v.findViewById(R.id.status); } - void bind(TransportNetwork network) { + @Override + void bind(Region region, boolean expanded) { + super.bind(region, expanded); + TransportNetwork network = (TransportNetwork)region; logo.setImageResource(network.getLogo()); - name.setText(network.getName(name.getContext())); desc.setText(network.getDescription(desc.getContext())); if (network.getStatus() == STABLE) { status.setVisibility(GONE); diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java index f63ada326..5bc3acdfd 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java @@ -33,7 +33,7 @@ public interface TransportNetworks { new TransportNetworkBuilder() .setId(NetworkId.RT) - .setRegion(Region.EUROPE) + .setRegion(Continent.EUROPE) .setName(R.string.np_name_rt) .setDescription(R.string.np_desc_rt) .setAgencies(R.string.np_desc_rt_networks) @@ -47,45 +47,45 @@ public interface TransportNetworks { .setName(R.string.np_name_db) .setDescription(R.string.np_desc_db) .setLogo(R.drawable.network_db_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.BVG) .setDescription(R.string.np_desc_bvg) .setLogo(R.drawable.network_bvg_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VBB) .setDescription(R.string.np_desc_vbb) .setLogo(R.drawable.network_vbb_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.BAYERN) .setName(R.string.np_name_bayern) .setDescription(R.string.np_desc_bayern) .setLogo(R.drawable.network_bayern_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.AVV) .setDescription(R.string.np_desc_avv) .setLogo(R.drawable.network_avv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .setStatus(BETA) .build(), new TransportNetworkBuilder() .setId(NetworkId.MVV) .setDescription(R.string.np_desc_mvv) .setLogo(R.drawable.network_mvv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.INVG) .setDescription(R.string.np_desc_invg) .setLogo(R.drawable.network_invg_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .setStatus(BETA) .build(), new TransportNetworkBuilder() @@ -93,45 +93,45 @@ public interface TransportNetworks { .setDescription(R.string.np_desc_vgn) .setAgencies(R.string.np_desc_vgn_networks) .setLogo(R.drawable.network_vgn_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .setStatus(BETA) .build(), new TransportNetworkBuilder() .setId(NetworkId.VVM) .setDescription(R.string.np_desc_vvm) .setLogo(R.drawable.network_vvm_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VMV) .setDescription(R.string.np_desc_vmv) .setLogo(R.drawable.network_vmv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.GVH) .setDescription(R.string.np_desc_gvh) .setLogo(R.drawable.network_gvh_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.BSVAG) .setName(R.string.np_name_bsvag) .setDescription(R.string.np_desc_bsvag) .setLogo(R.drawable.network_bsvag_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VVO) .setDescription(R.string.np_desc_vvo) .setLogo(R.drawable.network_vvo_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VMS) .setDescription(R.string.np_desc_vms) .setLogo(R.drawable.network_vms_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .setStatus(BETA) .build(), new TransportNetworkBuilder() @@ -139,87 +139,87 @@ public interface TransportNetworks { .setName(R.string.np_name_nasa) .setDescription(R.string.np_desc_nasa) .setLogo(R.drawable.network_nasa_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .setStatus(BETA) .build(), new TransportNetworkBuilder() .setId(NetworkId.VRR) .setDescription(R.string.np_desc_vrr) .setLogo(R.drawable.network_vrr_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.MVG) .setDescription(R.string.np_desc_mvg) .setLogo(R.drawable.network_mvg_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.NVV) .setName(R.string.np_name_nvv) .setDescription(R.string.np_desc_nvv) .setLogo(R.drawable.network_nvv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VRN) .setDescription(R.string.np_desc_vrn) .setLogo(R.drawable.network_vrn_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VVS) .setDescription(R.string.np_desc_vvs) .setLogo(R.drawable.network_vvs_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.DING) .setDescription(R.string.np_desc_ding) .setLogo(R.drawable.network_ding_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.KVV) .setDescription(R.string.np_desc_kvv) .setLogo(R.drawable.network_kvv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VAGFR) .setName(R.string.np_name_vagfr) .setDescription(R.string.np_desc_vagfr) .setLogo(R.drawable.network_vagfr_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.NVBW) .setDescription(R.string.np_desc_nvbw) .setLogo(R.drawable.network_nvbw_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VVV) .setDescription(R.string.np_desc_vvv) .setLogo(R.drawable.network_vvv_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VGS) .setDescription(R.string.np_desc_vgs) .setLogo(R.drawable.network_vgs_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VRS) .setDescription(R.string.np_desc_vrs) .setLogo(R.drawable.network_vrs_logo) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), new TransportNetworkBuilder() .setId(NetworkId.VMT) .setDescription(R.string.np_desc_vmt) - .setRegion(Region.GERMANY) + .setRegion(Country.GERMANY) .build(), // Austria @@ -229,53 +229,53 @@ public interface TransportNetworks { .setName(R.string.np_name_oebb) .setDescription(R.string.np_desc_oebb) .setLogo(R.drawable.network_oebb_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.VOR) .setDescription(R.string.np_desc_vor) .setLogo(R.drawable.network_vor_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.LINZ) .setName(R.string.np_name_linz) .setDescription(R.string.np_desc_linz) .setLogo(R.drawable.network_linz_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.VVT) .setDescription(R.string.np_desc_vvt) .setLogo(R.drawable.network_vvt_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.IVB) .setDescription(R.string.np_desc_ivb) .setLogo(R.drawable.network_ivb_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.STV) .setName(R.string.np_name_stv) .setDescription(R.string.np_desc_stv) .setLogo(R.drawable.network_stv_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.WIEN) .setName(R.string.np_name_wien) .setDescription(R.string.np_desc_wien) .setLogo(R.drawable.network_wien_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), new TransportNetworkBuilder() .setId(NetworkId.VMOBIL) .setName(R.string.np_name_vmobil) .setDescription(R.string.np_desc_vmobil) .setLogo(R.drawable.network_vmobil_logo) - .setRegion(Region.AUSTRIA) + .setRegion(Country.AUSTRIA) .build(), // Liechtenstein @@ -285,7 +285,7 @@ public interface TransportNetworks { .setName(R.string.np_name_vmobil) .setDescription(R.string.np_desc_vmobil) .setLogo(R.drawable.network_vmobil_logo) - .setRegion(Region.LIECHTENSTEIN) + .setRegion(Country.LIECHTENSTEIN) .build(), // Switzerland @@ -295,19 +295,19 @@ public interface TransportNetworks { .setName(R.string.np_name_sbb) .setDescription(R.string.np_desc_sbb) .setLogo(R.drawable.network_sbb_logo) - .setRegion(Region.SWITZERLAND) + .setRegion(Country.SWITZERLAND) .build(), new TransportNetworkBuilder() .setId(NetworkId.VBL) .setDescription(R.string.np_desc_vbl) .setLogo(R.drawable.network_vbl_logo) - .setRegion(Region.SWITZERLAND) + .setRegion(Country.SWITZERLAND) .build(), new TransportNetworkBuilder() .setId(NetworkId.ZVV) .setDescription(R.string.np_desc_zvv) .setLogo(R.drawable.network_zvv_logo) - .setRegion(Region.SWITZERLAND) + .setRegion(Country.SWITZERLAND) .build(), // Belgium @@ -318,7 +318,7 @@ public interface TransportNetworks { .setDescription(R.string.np_desc_sncb) .setAgencies(R.string.np_desc_sncb_networks) .setLogo(R.drawable.network_sncb_logo) - .setRegion(Region.BELGIUM) + .setRegion(Continent.EUROPE) .build(), // Luxembourg @@ -328,7 +328,7 @@ public interface TransportNetworks { .setName(R.string.np_name_lu) .setDescription(R.string.np_desc_lu) .setAgencies(R.string.np_desc_lu_networks) - .setRegion(Region.LUXEMBOURG) + .setRegion(Country.LUXEMBOURG) .build(), // Netherlands @@ -337,7 +337,7 @@ public interface TransportNetworks { .setId(NetworkId.NS) .setDescription(R.string.np_desc_ns) .setLogo(R.drawable.network_ns_logo) - .setRegion(Region.NETHERLANDS) + .setRegion(Country.NETHERLANDS) .setStatus(BETA) .build(), @@ -346,7 +346,7 @@ public interface TransportNetworks { .setName(R.string.np_name_negentwee) .setDescription(R.string.np_desc_negentwee) .setLogo(R.drawable.network_negentwee_logo) - .setRegion(Region.NETHERLANDS) + .setRegion(Country.NETHERLANDS) .setStatus(ALPHA) .build(), @@ -356,7 +356,7 @@ public interface TransportNetworks { .setId(NetworkId.DSB) .setDescription(R.string.np_desc_dsb) .setLogo(R.drawable.network_dsb_logo) - .setRegion(Region.DENMARK) + .setRegion(Country.DENMARK) .build(), // Sweden @@ -365,7 +365,7 @@ public interface TransportNetworks { .setId(NetworkId.SE) .setDescription(R.string.np_desc_se) .setLogo(R.drawable.network_se_logo) - .setRegion(Region.SWEDEN) + .setRegion(Country.SWEDEN) .build(), // Norway @@ -374,7 +374,7 @@ public interface TransportNetworks { .setId(NetworkId.NRI) .setDescription(R.string.np_desc_nri) .setLogo(R.drawable.network_nri_logo) - .setRegion(Region.NORWAY) + .setRegion(Country.NORWAY) .build(), // Finland @@ -382,7 +382,7 @@ public interface TransportNetworks { new TransportNetworkBuilder() .setId(NetworkId.HSL) .setDescription(R.string.np_desc_hsl) - .setRegion(Region.FINLAND) + .setRegion(Country.FINLAND) .setLogo(R.drawable.network_hsl_logo) .setStatus(BETA) .build(), @@ -392,13 +392,13 @@ public interface TransportNetworks { new TransportNetworkBuilder() .setId(NetworkId.TLEM) .setDescription(R.string.np_desc_tlem) - .setRegion(Region.GREAT_BRITAIN) + .setRegion(Country.GREAT_BRITAIN) .build(), new TransportNetworkBuilder() .setId(NetworkId.MERSEY) .setName(R.string.np_name_mersey) .setDescription(R.string.np_desc_mersey) - .setRegion(Region.GREAT_BRITAIN) + .setRegion(Country.GREAT_BRITAIN) .setLogo(R.drawable.network_mersey_logo) .build(), @@ -407,7 +407,7 @@ public interface TransportNetworks { new TransportNetworkBuilder() .setId(NetworkId.TFI) .setDescription(R.string.np_desc_tfi) - .setRegion(Region.IRELAND) + .setRegion(Country.IRELAND) .setLogo(R.drawable.network_tfi_logo) .build(), @@ -418,7 +418,7 @@ public interface TransportNetworks { .setName(R.string.np_name_it) .setDescription(R.string.np_desc_it) .setAgencies(R.string.np_desc_it_networks) - .setRegion(Region.ITALY) + .setRegion(Continent.EUROPE) .setLogo(R.drawable.network_it_logo) .setStatus(BETA) .setGoodLineNames(true) @@ -430,7 +430,7 @@ public interface TransportNetworks { .setId(NetworkId.PL) .setName(R.string.np_name_pl) .setDescription(R.string.np_desc_pl) - .setRegion(Region.POLAND) + .setRegion(Country.POLAND) .setLogo(R.drawable.network_pl_logo) .build(), @@ -440,7 +440,7 @@ public interface TransportNetworks { .setId(NetworkId.DUB) .setName(R.string.np_name_dub) .setDescription(R.string.np_desc_dub) - .setRegion(Region.UAE) + .setRegion(Country.UAE) .setStatus(BETA) .build(), @@ -451,7 +451,7 @@ public interface TransportNetworks { .setName(R.string.np_name_rtachicago) .setDescription(R.string.np_desc_rtachicago) .setAgencies(R.string.np_desc_rtachicago_networks) - .setRegion(Region.USA) + .setRegion(Country.USA) .setLogo(R.drawable.network_rtachicago_logo) .setStatus(BETA) .build(), @@ -459,7 +459,7 @@ public interface TransportNetworks { .setId(NetworkId.CALIFORNIA) .setName(R.string.np_name_california) .setDescription(R.string.np_desc_california) - .setRegion(Region.USA) + .setRegion(Country.USA) .setLogo(R.drawable.network_california_logo) .setStatus(ALPHA) .build(), @@ -467,7 +467,7 @@ public interface TransportNetworks { .setId(NetworkId.OREGON) .setName(R.string.np_name_oregon) .setDescription(R.string.np_desc_oregon) - .setRegion(Region.USA) + .setRegion(Country.USA) .setLogo(R.drawable.network_oregon_logo) .setStatus(ALPHA) .build(), @@ -475,7 +475,7 @@ public interface TransportNetworks { .setId(NetworkId.NEWYORK) .setName(R.string.np_name_usny) .setDescription(R.string.np_desc_usny) - .setRegion(Region.USA) + .setRegion(Country.USA) .setStatus(ALPHA) .build(), @@ -486,7 +486,7 @@ public interface TransportNetworks { .setName(R.string.np_name_australia) .setDescription(R.string.np_desc_australia) .setAgencies(R.string.np_desc_australia_networks) - .setRegion(Region.AUSTRALIA) + .setRegion(Country.AUSTRALIA) .setLogo(R.drawable.network_aus_logo) .setStatus(BETA) .build(), @@ -495,7 +495,7 @@ public interface TransportNetworks { .setId(NetworkId.SYDNEY) .setName(R.string.np_name_sydney) .setDescription(R.string.np_desc_sydney) - .setRegion(Region.AUSTRALIA) + .setRegion(Country.AUSTRALIA) .setLogo(R.drawable.network_sydney_logo) .build(), @@ -506,7 +506,7 @@ public interface TransportNetworks { .setName(R.string.np_name_paris) .setDescription(R.string.np_desc_paris) .setAgencies(R.string.np_desc_paris_networks) - .setRegion(Region.FRANCE) + .setRegion(Country.FRANCE) .setLogo(R.drawable.network_paris_logo) .setStatus(BETA) .build(), @@ -515,7 +515,7 @@ public interface TransportNetworks { .setName(R.string.np_name_frenchsouthwest) .setDescription(R.string.np_desc_frenchsouthwest) .setAgencies(R.string.np_desc_frenchsouthwest_networks) - .setRegion(Region.FRANCE) + .setRegion(Country.FRANCE) .setLogo(R.drawable.network_francesouthwest_logo) .setStatus(BETA) .setGoodLineNames(true) @@ -525,7 +525,7 @@ public interface TransportNetworks { .setName(R.string.np_name_francenortheast) .setDescription(R.string.np_desc_francenortheast) .setAgencies(R.string.np_desc_francenortheast_networks) - .setRegion(Region.FRANCE) + .setRegion(Country.FRANCE) .setLogo(R.drawable.network_francenortheast_logo) .setStatus(ALPHA) .setGoodLineNames(true) @@ -535,7 +535,7 @@ public interface TransportNetworks { .setName(R.string.np_name_francenorthwest) .setDescription(R.string.np_desc_francenorthwest) .setAgencies(R.string.np_desc_francenorthwest_networks) - .setRegion(Region.FRANCE) + .setRegion(Country.FRANCE) .setLogo(R.drawable.network_francenorthwest_logo) .setStatus(ALPHA) .build(), @@ -544,7 +544,7 @@ public interface TransportNetworks { .setName(R.string.np_name_frenchsoutheast) .setDescription(R.string.np_desc_frenchsoutheast) .setAgencies(R.string.np_desc_frenchsoutheast_networks) - .setRegion(Region.FRANCE) + .setRegion(Country.FRANCE) .setLogo(R.drawable.network_francesoutheast_logo) .setStatus(BETA) .setGoodLineNames(true) @@ -557,7 +557,7 @@ public interface TransportNetworks { .setName(R.string.np_name_nz) .setDescription(R.string.np_desc_nz) .setAgencies(R.string.np_desc_nz_networks) - .setRegion(Region.NEW_ZEALAND) + .setRegion(Continent.OCEANIA) .setLogo(R.drawable.network_nz_logo) .setStatus(BETA) .build(), @@ -569,7 +569,7 @@ public interface TransportNetworks { .setName(R.string.np_name_spain) .setDescription(R.string.np_desc_spain) .setAgencies(R.string.np_desc_spain_networks) - .setRegion(Region.SPAIN) + .setRegion(Continent.EUROPE) .setLogo(R.drawable.network_spain_logo) .setStatus(BETA) .build(), @@ -581,7 +581,7 @@ public interface TransportNetworks { .setName(R.string.np_name_br) .setDescription(R.string.np_desc_br) .setAgencies(R.string.np_desc_br_networks) - .setRegion(Region.BRAZIL) + .setRegion(Country.BRAZIL) .setLogo(R.drawable.network_br_logo) .setStatus(ALPHA) .setGoodLineNames(true) @@ -591,7 +591,7 @@ public interface TransportNetworks { .setName(R.string.np_name_br_floripa) .setDescription(R.string.np_desc_br_floripa) .setAgencies(R.string.np_desc_br_floripa_networks) - .setRegion(Region.BRAZIL) + .setRegion(Country.BRAZIL) .setLogo(R.drawable.network_brfloripa_logo) .setStatus(ALPHA) .setGoodLineNames(true) @@ -604,7 +604,7 @@ public interface TransportNetworks { .setName(R.string.np_name_ontario) .setDescription(R.string.np_desc_ontario) .setAgencies(R.string.np_desc_ontario_networks) - .setRegion(Region.CANADA) + .setRegion(Country.CANADA) .setLogo(R.drawable.network_ontario_logo) .setStatus(BETA) .setGoodLineNames(true) @@ -614,7 +614,7 @@ public interface TransportNetworks { .setName(R.string.np_name_quebec) .setDescription(R.string.np_desc_quebec) .setAgencies(R.string.np_desc_quebec_networks) - .setRegion(Region.CANADA) + .setRegion(Country.CANADA) .setLogo(R.drawable.network_quebec_logo) .setStatus(ALPHA) .setGoodLineNames(true) @@ -627,7 +627,7 @@ public interface TransportNetworks { .setName(R.string.np_name_costa_rica) .setDescription(R.string.np_desc_costa_rica) .setAgencies(R.string.np_desc_costa_rica_networks) - .setRegion(Region.COSTA_RICA) + .setRegion(Continent.CENTRAL_AMERICA) .setStatus(ALPHA) .setGoodLineNames(true) .build(), @@ -638,7 +638,7 @@ public interface TransportNetworks { .setId(NetworkId.GHANA) .setName(R.string.np_name_ghana) .setDescription(R.string.np_desc_ghana) - .setRegion(Region.AFRICA) + .setRegion(Continent.AFRICA) .setStatus(ALPHA) .setGoodLineNames(true) .build(), diff --git a/app/src/main/res/layout/activity_pick_transport_network.xml b/app/src/main/res/layout/activity_pick_transport_network.xml index 7e56243b8..1bb9d5df3 100644 --- a/app/src/main/res/layout/activity_pick_transport_network.xml +++ b/app/src/main/res/layout/activity_pick_transport_network.xml @@ -49,6 +49,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" - tools:listitem="@layout/list_item_transport_region"/> + tools:listitem="@layout/list_item_transport_country"/> diff --git a/app/src/main/res/layout/list_item_transport_continent.xml b/app/src/main/res/layout/list_item_transport_continent.xml new file mode 100644 index 000000000..fe0b86133 --- /dev/null +++ b/app/src/main/res/layout/list_item_transport_continent.xml @@ -0,0 +1,52 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/list_item_transport_region.xml b/app/src/main/res/layout/list_item_transport_country.xml similarity index 96% rename from app/src/main/res/layout/list_item_transport_region.xml rename to app/src/main/res/layout/list_item_transport_country.xml index ba7711c13..7a99b90a2 100644 --- a/app/src/main/res/layout/list_item_transport_region.xml +++ b/app/src/main/res/layout/list_item_transport_country.xml @@ -1,6 +1,6 @@ + tools:text="Network Provider Country"/> Quebec Dinamarca Dinamarca, Copenhagen - Europa Europa Finlàndia Helsinki @@ -136,7 +135,6 @@ Irlanda, Dublin, Belfast Israel Israel, Jerusalem - Itàlia Itàlia Liechtenstein Liechtenstein, Vorarlberg, Bregenz @@ -146,11 +144,9 @@ Holanda, Amsterdam Noruega Noruega, Oslo, Bergen - Nova Zelanda Nova Zelanda Polònia Polònia, trens a Polònia - Espanya Espanya Suècia Suècia, Estocolm diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 263e18822..d442f0ed1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -78,10 +78,8 @@ Co je nového Více... Mnoho autobusových linek, žádné Executivos - Evropa Evropa Většina Německa - Španělsko Španělsko Spojené arabské Emiráty, Dubai diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f089a201f..22d52e074 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -149,6 +149,13 @@ es welche gibt) anzeigen lassen. Änderungsprotokoll Was gibt\'s Neues Mehr… + Europa + Afrika + Nordamerika + Zentralamerika + Südamerika + Asien + Ozeanien Australien Melbourne, Sydney, Brisbane, Perth, Adelaide, Hobart, Launceston, Burnie Australien, Neusüdwales, Sydney @@ -174,7 +181,6 @@ es welche gibt) anzeigen lassen. Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Québec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Dänemark Dänemark, Kopenhagen - Europa Europa Nur Fernzüge Railteam-Allianz @@ -231,7 +237,6 @@ es welche gibt) anzeigen lassen. Irland, Dublin, Belfast Israel Israel, Jerusalem - Italien Italien Rom, Mailand, Turin, Venedig, Palermo, Trient Liechtenstein @@ -244,12 +249,10 @@ es welche gibt) anzeigen lassen. Sämtliche öffentliche Verkehrsmittel in Belgien Norwegen Norwegen, Oslo, Bergen - Neuseeland Neuseeland Neuseeland, Wellington, Auckland Polen Polen, Eisenbahnen in Polen - Spanien Spanien Madrid, Barcelona, Baskenland, Valencia, Alicante, Mallorca, Menorca, Teneriffa, La Palma, Navarra Schweden diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index fd18c39a3..eedc73658 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -167,7 +167,6 @@ Vi ankaŭ povas esplori proksimajn staciojn kaj rigardi baldaŭajn forveturojn i Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Kebekio, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montrealo, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danujo Danujo, Kopenhago - Eŭropo Eŭropo Nur long-distancaj vagonaroj Societo Railteam @@ -224,7 +223,6 @@ Vi ankaŭ povas esplori proksimajn staciojn kaj rigardi baldaŭajn forveturojn i Irlando, Dublino, Belfasto Israelo Israelo, Jerusalemo - Italujo Italujo Romo, Milano, Torino, Venecio, Palermo, Trento Liĥtenŝtejno @@ -237,12 +235,10 @@ Vi ankaŭ povas esplori proksimajn staciojn kaj rigardi baldaŭajn forveturojn i Publika transporto en Nederlando Norvegujo Norvegujo, Oslo, Bergen - Nov-Zelando Nov-Zelando Nov-Zelando, Velingtono, Auckland Polujo Polujo, fervojo en Polujo - Hispanujo Hispanujo Madrido, Barcelono, Eŭskujo, Valencio, Alakanto, Majorko, Minorko, Tenerifo, La Palma, Navaro Svedujo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5c4403197..84aa03913 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -105,6 +105,13 @@ Inténtelo de nuevo más tarde, por favor. Cambios Novedades Más... + Europa + Africa + América del Norte + América Central + América del Sur + Asia + Oceanía Australia Australia, Nueva Gales del Sur, Sídney Austria @@ -129,7 +136,6 @@ Inténtelo de nuevo más tarde, por favor. Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Dinamarca Dinamarca, Copenhague - Europa Europa sólo larga distancia Alianza Railteam @@ -186,7 +192,6 @@ Inténtelo de nuevo más tarde, por favor. Irlanda, Dublín, Belfast Israel Israel, Jerusalén - Italia Italia Roma, Milano, Turín, Venecia, Palermo, Trento Liechtenstein @@ -199,13 +204,11 @@ Inténtelo de nuevo más tarde, por favor. Todo el transporte público de Países Bajos Noruega Noruega, Oslo, Bergen - Nueva Zelanda Nueva Zelanda Nueva Zelanda, Wellington, Auckland Polonia Polonia, lineas de ferrocarriles en Polonia - España - España + España Madrid, Barcelona, Euskadi - País Vasco, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Suecia Suecia, Estocolmo diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index c699e062c..cdf65c9d5 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -172,7 +172,6 @@ Hurbileko geltokiak aurkitu ditzakezu ere eta hurrengo irteerak ikusi atzerapek Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danimarka Danimarka, Kopenhage - Europa Europa Distantzia handiko trenak soilik Railteam aliantza @@ -229,7 +228,6 @@ Hurbileko geltokiak aurkitu ditzakezu ere eta hurrengo irteerak ikusi atzerapek Irlanda, Dublin, Belfast Israel Israel, Jerusalem - Italia Italia Roma, Milan, Turin, Venezia, Palermo, Trento Liechtenstein @@ -242,12 +240,10 @@ Hurbileko geltokiak aurkitu ditzakezu ere eta hurrengo irteerak ikusi atzerapek Herbehereetako garraio publiko guztia Norvegia Norvegia, Oslo, Bergen - Zeelanda Berria Zeelanda Berria Zeelanda Berria, Wellington, Auckland Polonia Polonia, Poloniako trenbideak - Espainia Espainia Madril, Bartzelona, Euskadi, Nafarroa, Valentzia, Alacant, Mallorca, Menorca, Tenerife, La Palma Suedia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 02eb94331..fdde9908c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -168,7 +168,6 @@ Vous pouvez aussi découvrir les arrêts, stations alentour et afficher les proc Deux-Montagnes, Laval, L’Assomption, Outaouais, Sud-Ouest, Québec, Haut-Saint-Laurent, Lanaudière, La Presqu’Île, Laurentides, Montréal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danemark Danemark, Copenhague - Europe Europe Trains longue distance seulement Alliance Railteam @@ -225,7 +224,6 @@ Vous pouvez aussi découvrir les arrêts, stations alentour et afficher les proc Irlande, Dublin, Belfast Israël Israël, Jérusalem - Italie Italie Rome, Milan, Turin, Venise, Palerme, Trente Liechtenstein @@ -238,12 +236,10 @@ Vous pouvez aussi découvrir les arrêts, stations alentour et afficher les proc Tous les transports en commun des Pays-Bas Norvège Norvège, Oslo, Bergen - Nouvelle-Zélande Nouvelle-Zélande Nouvelle-Zélande, Wellington, Auckland Pologne Pologne, chemins de fer en Pologne - Espagne Espagne Madrid, Barcelone, Pays basque, Valence, Alicante, Majorque, Minore, Tenerife, La Palma, Navarre Suède diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e3ad83802..7de0558a2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -120,7 +120,6 @@ A Transportr irányt mutat az otthonodtól, jelenlegi helyzetedtől vagy egy ado Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Dánia Dánia, Koppenhága - Európa Európa Csak hosszútávú vonatok Railteam alliance @@ -177,7 +176,6 @@ A Transportr irányt mutat az otthonodtól, jelenlegi helyzetedtől vagy egy ado Írország, Dublin, Belfast Izrael Izrael, Jeruzsálem - Olaszország Olaszország Róma, Milánó, Torinó, Velence, Palermo, Trento Liechtenstein @@ -190,13 +188,11 @@ A Transportr irányt mutat az otthonodtól, jelenlegi helyzetedtől vagy egy ado A teljes Holland tömegközlekedési hálózat Norvégia Norvégia, Oslo, Bergen - Új-zéland Új-zéland Új-Zéland, Welligton, Auckland Lengyelország Lengyelország, vasúti útvonalak Lengyelországban - Spanyolország - Spanyolország + Spanyolország Madrid, Barcelona, Baszkföld, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Svédország Svédország, Stockholm diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 604604697..6a00ed0a5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -168,7 +168,6 @@ Puoi anche scoprire stazioni vicine e visualizzare le prossime partenze, inclusi Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danimarca Danimarca, Copenhagen - Europa Europa Solo treni a lunga percorrenza Railteam @@ -225,7 +224,6 @@ Puoi anche scoprire stazioni vicine e visualizzare le prossime partenze, inclusi Irlanda, Dublino, Belfast Israele Israele, Gerusalemme - Italia Italia Roma, Milano, Torino, Venezia, Palermo, Trento Liechtenstein @@ -238,12 +236,10 @@ Puoi anche scoprire stazioni vicine e visualizzare le prossime partenze, inclusi Tutti i trasporti pubblici nei Paesi Bassi Norvegia Norvegia, Oslo, Bergen - Nuova Zelanda Nuova Zelanda Nuova Zelanda, Wellington, Auckland Polonia Polonia, ferrovie in Polonia - Spagna Spagna Madrid, Barcellona, Paesi Baschi, Valencia, Alicante, Maiorca, Menorca, Tenerife, La Palma, Navarra Svezia diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 74b3ed7f8..2b2852c1e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -171,7 +171,6 @@ ドゥ-モンターニュ、ラバル、ラソンプシオン、ウタウエ、南西部、ケベック、オー-サン-ローラン、ラノディエール地域、ラ・プレスクイル、ローレンティッド地域、モントリオール、レムーラン、リシュリューバレー、シャンブリーリシュリュー-カリニャン、ルシヨン、ソレル-ヴァレンヌザ、Le Richelain、シャーブルック、サントジュリー デンマーク デンマーク、コペンハーゲン - ヨーロッパ ヨーロッパ 長距離列車のみ 鉄道アライアンス @@ -228,7 +227,6 @@ アイルランド、ダブリン、ベルファスト イスラエル イスラエル、エルサレム - イタリア イタリア ローマ、ミラノ、トリノ、ヴェネツィア、パレルモ、トレント リヒテンシュタイン @@ -241,12 +239,10 @@ オランダのすべての公共交通機関 ノルウェー ノルウェー、オスロ、ベルゲン - ニュージーランド ニュージーランド ニュージーランド、ウェリントン、オークランド ポーランド ポーランド、ポーランドの鉄道 - スペイン スペイン マドリード、バルセロナ、バスク地方、バレンシア、アリカンテ、マヨルカ、メノルカ、テネリフェ、ラ・パルマ、ナバラ スウェーデン diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 0a78e0a43..f639bb16e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -173,7 +173,6 @@ Du kan oppdage stasjoner i nærheten og vise kommende avganger, inkludert forsin Deux-Montagnes, Laval, L\'Assomption, Outaouais, Le Sud-Ouest, Québec, Montérégie, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danmark Danmark, København - Europa Europa Bare langdistansetog Railteam-alliansen @@ -230,7 +229,6 @@ Du kan oppdage stasjoner i nærheten og vise kommende avganger, inkludert forsin Irland, Dublin, Belfast Israel Israel, Jerusalem - Italia Italia Rom, Milano, Torino, Venedig, Palermo, Trient Liechtenstein @@ -243,12 +241,10 @@ Du kan oppdage stasjoner i nærheten og vise kommende avganger, inkludert forsin All offentlig transport i Holland Norge Norge, Oslo, Bergen - Ny-Zealand Ny-Zealand Ny-Zealand, Wellington, Auckland Polen Polen, jernbane i Polen - Spania Spania Madrid, Barcelona, Baskerland, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Sverige diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0589a0a43..4ab7f0c22 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -123,7 +123,6 @@ Je kan ook dichtbijgelegen stations vinden en vertrektijden bekijken, inclusief Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Denemarken Denemarken, Kopenhagen - Europa Europa Alleen langeafstandstreinen Railteam-alliantie @@ -180,7 +179,6 @@ Je kan ook dichtbijgelegen stations vinden en vertrektijden bekijken, inclusief Ierland, Dublin, Belfast Israël Israël, Jeruzalem - Italië Italie Rome, Milaan, Turijn, Venetië, Palermo, Trente Liechtenstein @@ -193,12 +191,10 @@ Je kan ook dichtbijgelegen stations vinden en vertrektijden bekijken, inclusief Alle OV in Nederland Noorwegen Noorwegen, Oslo, Bergen - Nieuw-Zeeland Nieuw-Zeeland Nieuw-Zeeland, Wellington, Auckland Polen Polen, spoorwegen in Polen - Spanje Spanje Zweden Zweden, Stockholm diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c5b974c9f..cf846c4cc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -169,7 +169,6 @@ Możesz także przeszukiwać pobliskie stacje i przyszłe odjazdy wraz z opóźn Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Dania Dania, Kopenhaga - Europa Europa Tylko pociągi długodystansowe Sieć Railteam @@ -226,7 +225,6 @@ Możesz także przeszukiwać pobliskie stacje i przyszłe odjazdy wraz z opóźn Irlandia, Dublin, Belfast Izrael Izrael, Jerozolima - Włochy Włochy Rzym, Mediolan, Turyn, Wenecja, Palermo, Trydent Liechtenstein @@ -239,12 +237,10 @@ Możesz także przeszukiwać pobliskie stacje i przyszłe odjazdy wraz z opóźn Transport publiczny w Holandii Norwegia Norwegia, Oslo, Bergen - Nowa Zelandia Nowa Zelandia Nowa Zelandia, Wellington, Auckland Polska Polska, koleje w Polsce - Hiszpania Hiszpania Madryt, Barcelona, Kraj Basków, Walencja, Alicante, Majorka, Minorka, Teneryfa, La Palma, Nawarra Szwecja diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d51383551..293ab555b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -168,7 +168,6 @@ Você pode também descobrir terminais por perto e visualizar os ônibus que est Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Dinamarca Dinamarca, Copenhague - Europa Europa Apenas trens de longa distancia aliança Railteam @@ -217,7 +216,6 @@ Você pode também descobrir terminais por perto e visualizar os ônibus que est Irlanda, Dublin, Belfast Israel Israel, Jerusalém - Itália Itália Liechtenstein Liechtenstein, Vorarlberg, Bregenz @@ -227,11 +225,9 @@ Você pode também descobrir terminais por perto e visualizar os ônibus que est Países Baixos, Amsterdã Noruega Noruega, Oslo, Bergen - Nova Zelândia Nova Zelândia Polônia Polônia, ferrovias na Polônia - Espanha Espanha Suécia Suécia, Estocolmo diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 45ce9f3cf..8eb8b0cf3 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -82,7 +82,6 @@ Transportr, நீங்கள் வசிக்கும் இடத்தி கனடா டென்மார்க் டென்மார்க், கோபன்ஹேகன் - ஐரோப்பா ஐரோப்பா ஃபின்லாந்து ஹெல்சின்கி @@ -105,7 +104,6 @@ Transportr, நீங்கள் வசிக்கும் இடத்தி ஐயர்லாந்து, டப்லின், பெல்ஃபாஸ்ட் இஸ்ரேல் இஸ்ரேல், ஜெருசலேம் - இத்தாலி இத்தாலி லக்ஸம்பர்க் லக்ஸம்பர்க் @@ -113,10 +111,8 @@ Transportr, நீங்கள் வசிக்கும் இடத்தி நெதர்லாந்து, ஆம்ஸ்டர்டாம் நார்வே நார்வே, ஓஸ்லோ, பெர்கென் - நியூசிலாந்து நியூசிலாந்து போலாந்து - ஸ்பெயின் ஸ்பெயின் சுவீடன் சுவீடன், ஸ்டாக்ஹோம் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5212cd075..a5e9b79f3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -100,7 +100,6 @@ Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie Danimarka Danimarka, Kopenhag - Avrupa Avrupa Sadece Uzun Yol Trenleri Finlandiya @@ -156,7 +155,6 @@ İrlanda, Dublin, Belfast İsrail İsrail, Kudüs - İtalya İtalya Roma, Milan, Turin, Venedik, Palermo, Trento Lihtenştayn @@ -168,12 +166,10 @@ Hollanda\'daki tüm toplu taşımalar Norveç Norveç, Oslo, Bergen - Yeni Zelanda Yeni Zelanda Yeni Zelanda, Wellington, Auckland Polonya Polonya, Polonya demiryolları - İspanya İspanya Madrid, Barselona, Bask Ülkesi, Valensiya, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra İsveç diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9097b1e9..a777c6094 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -178,6 +178,14 @@ there are any). Changelog What\'s New More… + + Europe + Africa + North America + Central America + South America + Asia + Oceania Australia Australia @@ -222,7 +230,6 @@ there are any). Denmark Denmark, Copenhagen - Europe Europe Long-distance trains only Railteam alliance @@ -299,7 +306,6 @@ there are any). Israel Israel, Jerusalem - Italy Italy Rome, Milan, Turin, Venice, Palermo, Trento ATM, GTT, AMAT, ACTV @@ -321,7 +327,6 @@ there are any). Norway Norway, Oslo, Bergen - New Zealand New Zealand New-Zealand, Wellington, Auckland Go Wellington, Tranz Metro, Auckland Transport @@ -330,7 +335,6 @@ there are any). PKP Poland, railways in Poland - Spain Spain Madrid, Barcelona, Basque Country, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra CRTM, TMB, FGC, Moveuskadi, Metrovalencia, EMT Valencia, TRAM, CTM, EMT Palma, CIME, Tranvía, TITSA, TILP, Transporte Interurbano de Navarra @@ -360,12 +364,10 @@ there are any). Oregon Global Transport in Oregon State (USA) - Costa Rica Costa Rica Tren Urbano INCOFER - Africa Ghana Accra From f4efb0e4c80732b40ddf357f97b490fb2726be58 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Thu, 21 Dec 2017 16:17:27 -0600 Subject: [PATCH 2/9] added continent contour lines and improved the list (items) design --- .../grobox/transportr/networks/Continent.java | 24 +- .../networks/ContinentViewHolder.java | 9 + .../main/res/drawable/continent_africa.xml | 14 ++ app/src/main/res/drawable/continent_asia.xml | 14 ++ .../drawable/continent_central_america.xml | 14 ++ .../main/res/drawable/continent_europe.xml | 14 ++ .../res/drawable/continent_north_america.xml | 14 ++ .../main/res/drawable/continent_oceania.xml | 14 ++ .../res/drawable/continent_south_america.xml | 14 ++ .../activity_pick_transport_network.xml | 2 +- .../layout/list_item_transport_continent.xml | 14 +- .../layout/list_item_transport_country.xml | 21 +- .../layout/list_item_transport_network.xml | 4 +- artwork/continent_africa.svg | 218 ++++++++++++++++++ artwork/continent_asia.svg | 218 ++++++++++++++++++ artwork/continent_central_america.svg | 218 ++++++++++++++++++ artwork/continent_europe.svg | 218 ++++++++++++++++++ artwork/continent_north_america.svg | 218 ++++++++++++++++++ artwork/continent_oceania.svg | 218 ++++++++++++++++++ artwork/continent_south_america.svg | 218 ++++++++++++++++++ 20 files changed, 1672 insertions(+), 26 deletions(-) create mode 100644 app/src/main/res/drawable/continent_africa.xml create mode 100644 app/src/main/res/drawable/continent_asia.xml create mode 100644 app/src/main/res/drawable/continent_central_america.xml create mode 100644 app/src/main/res/drawable/continent_europe.xml create mode 100644 app/src/main/res/drawable/continent_north_america.xml create mode 100644 app/src/main/res/drawable/continent_oceania.xml create mode 100644 app/src/main/res/drawable/continent_south_america.xml create mode 100644 artwork/continent_africa.svg create mode 100644 artwork/continent_asia.svg create mode 100644 artwork/continent_central_america.svg create mode 100644 artwork/continent_europe.svg create mode 100644 artwork/continent_north_america.svg create mode 100644 artwork/continent_oceania.svg create mode 100644 artwork/continent_south_america.svg diff --git a/app/src/main/java/de/grobox/transportr/networks/Continent.java b/app/src/main/java/de/grobox/transportr/networks/Continent.java index b513d5f91..4222c1568 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Continent.java +++ b/app/src/main/java/de/grobox/transportr/networks/Continent.java @@ -20,6 +20,7 @@ package de.grobox.transportr.networks; import android.content.Context; +import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; import android.support.annotation.StringRes; @@ -30,19 +31,21 @@ @ParametersAreNonnullByDefault enum Continent implements Region { - EUROPE(R.string.np_continent_europe), - AFRICA(R.string.np_continent_africa), - NORTH_AMERICA(R.string.np_continent_north_america), - CENTRAL_AMERICA(R.string.np_continent_central_america), - SOUTH_AMERICA(R.string.np_continent_south_america), - ASIA(R.string.np_continent_asia), - OCEANIA(R.string.np_continent_oceania); + EUROPE(R.string.np_continent_europe, R.drawable.continent_europe), + AFRICA(R.string.np_continent_africa, R.drawable.continent_africa), + NORTH_AMERICA(R.string.np_continent_north_america, R.drawable.continent_north_america), + CENTRAL_AMERICA(R.string.np_continent_central_america, R.drawable.continent_central_america), + SOUTH_AMERICA(R.string.np_continent_south_america, R.drawable.continent_south_america), + ASIA(R.string.np_continent_asia, R.drawable.continent_asia), + OCEANIA(R.string.np_continent_oceania, R.drawable.continent_oceania); private final @StringRes int name; + private final @DrawableRes int contour; - Continent(@StringRes int name) { + Continent(@StringRes int name, @DrawableRes int contour) { this.name = name; + this.contour = contour; } @StringRes @@ -50,6 +53,11 @@ public int getName() { return name; } + @DrawableRes + public int getContour() { + return contour; + } + @Override public String getName(Context context) { return context.getString(name); diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java index 0b74da17c..33a59b072 100644 --- a/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java @@ -32,7 +32,16 @@ class ContinentViewHolder extends ParentRegionViewHolder { + private final ImageView contour; + ContinentViewHolder(View v) { super(v); + contour = v.findViewById(R.id.contour); + } + + void bind(Region region, boolean expanded) { + super.bind(region, expanded); + Continent continent = (Continent)region; + contour.setImageResource(continent.getContour()); } } diff --git a/app/src/main/res/drawable/continent_africa.xml b/app/src/main/res/drawable/continent_africa.xml new file mode 100644 index 000000000..9285bf55d --- /dev/null +++ b/app/src/main/res/drawable/continent_africa.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_asia.xml b/app/src/main/res/drawable/continent_asia.xml new file mode 100644 index 000000000..e9d519c7d --- /dev/null +++ b/app/src/main/res/drawable/continent_asia.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_central_america.xml b/app/src/main/res/drawable/continent_central_america.xml new file mode 100644 index 000000000..0291492ee --- /dev/null +++ b/app/src/main/res/drawable/continent_central_america.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_europe.xml b/app/src/main/res/drawable/continent_europe.xml new file mode 100644 index 000000000..a7ba78b58 --- /dev/null +++ b/app/src/main/res/drawable/continent_europe.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_north_america.xml b/app/src/main/res/drawable/continent_north_america.xml new file mode 100644 index 000000000..86fdb062c --- /dev/null +++ b/app/src/main/res/drawable/continent_north_america.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_oceania.xml b/app/src/main/res/drawable/continent_oceania.xml new file mode 100644 index 000000000..1b5300627 --- /dev/null +++ b/app/src/main/res/drawable/continent_oceania.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_south_america.xml b/app/src/main/res/drawable/continent_south_america.xml new file mode 100644 index 000000000..ec70747ba --- /dev/null +++ b/app/src/main/res/drawable/continent_south_america.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pick_transport_network.xml b/app/src/main/res/layout/activity_pick_transport_network.xml index 1bb9d5df3..615767fd8 100644 --- a/app/src/main/res/layout/activity_pick_transport_network.xml +++ b/app/src/main/res/layout/activity_pick_transport_network.xml @@ -49,6 +49,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" - tools:listitem="@layout/list_item_transport_country"/> + tools:listitem="@layout/list_item_transport_continent"/> diff --git a/app/src/main/res/layout/list_item_transport_continent.xml b/app/src/main/res/layout/list_item_transport_continent.xml index fe0b86133..34aa9ca4a 100644 --- a/app/src/main/res/layout/list_item_transport_continent.xml +++ b/app/src/main/res/layout/list_item_transport_continent.xml @@ -8,6 +8,14 @@ android:layout_height="48dp" android:background="?selectableItemBackground"> + + diff --git a/app/src/main/res/layout/list_item_transport_network.xml b/app/src/main/res/layout/list_item_transport_network.xml index cb1db8785..074aa53f3 100644 --- a/app/src/main/res/layout/list_item_transport_network.xml +++ b/app/src/main/res/layout/list_item_transport_network.xml @@ -11,8 +11,8 @@ + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_asia.svg b/artwork/continent_asia.svg new file mode 100644 index 000000000..d7cc2bd07 --- /dev/null +++ b/artwork/continent_asia.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_central_america.svg b/artwork/continent_central_america.svg new file mode 100644 index 000000000..b5aff8206 --- /dev/null +++ b/artwork/continent_central_america.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_europe.svg b/artwork/continent_europe.svg new file mode 100644 index 000000000..921186a9f --- /dev/null +++ b/artwork/continent_europe.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_north_america.svg b/artwork/continent_north_america.svg new file mode 100644 index 000000000..d43cd7509 --- /dev/null +++ b/artwork/continent_north_america.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_oceania.svg b/artwork/continent_oceania.svg new file mode 100644 index 000000000..365210036 --- /dev/null +++ b/artwork/continent_oceania.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + diff --git a/artwork/continent_south_america.svg b/artwork/continent_south_america.svg new file mode 100644 index 000000000..f6d33d33c --- /dev/null +++ b/artwork/continent_south_america.svg @@ -0,0 +1,218 @@ + + + + + + image/svg+xml + + World Map + + + + + + World Map + + + From 47a075ff652558f262a14e05b43234e23a5f1a63 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Mon, 5 Feb 2018 18:03:42 -0600 Subject: [PATCH 3/9] update to FastAdapter 3.2.3 and introduce type parameters --- app/build.gradle | 8 ++--- .../transportr/networks/ContinentItem.java | 10 ++---- .../networks/ContinentViewHolder.java | 8 ++--- .../grobox/transportr/networks/Country.java | 2 +- .../transportr/networks/CountryItem.java | 9 ++--- .../networks/CountryViewHolder.java | 7 ++-- .../PickTransportNetworkActivity.java | 14 ++++---- .../transportr/networks/RegionItem.java | 33 ++++++------------- .../transportr/networks/RegionViewHolder.java | 9 ++--- .../networks/TransportNetworkItem.java | 8 ++--- .../networks/TransportNetworkViewHolder.java | 7 ++-- 11 files changed, 44 insertions(+), 71 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4bcf66c57..dc4903f37 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,8 +113,9 @@ dependencies { implementation 'com.google.android:flexbox:0.3.1' implementation 'com.mikepenz:materialdrawer:6.0.0' implementation 'com.mikepenz:aboutlibraries:6.0.0' - implementation 'com.mikepenz:fastadapter-commons:3.0.5@aar' - implementation 'com.mikepenz:fastadapter-extensions-expandable:3.0.5@aar' + implementation 'com.mikepenz:fastadapter:3.2.3@aar' + implementation 'com.mikepenz:fastadapter-commons:3.2.3@aar' + implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.3@aar' implementation 'uk.co.samuelwall:material-tap-target-prompt:2.1.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.3.0' @@ -228,9 +229,6 @@ dependencyVerification { 'com.mapbox.mapboxsdk:mapbox-java-geojson:2.2.9:mapbox-java-geojson-2.2.9.jar:e888f38e36173a1ac39f3ba08fe6ba50d809b5d05ca8de5c143dee35114bfd91', 'com.mapzen.android:lost:3.0.4:lost-3.0.4.aar:7c95374ddd406356a6a3085c93e1a549feb68e919b29a8f0f194bc47f27788c0', 'com.mikepenz:aboutlibraries:6.0.0:aboutlibraries-6.0.0.aar:9d59e0c6caddda8bdcac1f8dd46ca824dde671b3201e6612a9ca297470da66a1', - 'com.mikepenz:fastadapter-commons:3.0.3:fastadapter-commons-3.0.3.aar:c73e2b079523431ec9313fbcf82f5d659ce47aeae1838965869eaadf81a2c0bd', - 'com.mikepenz:fastadapter-extensions-expandable:3.0.3:fastadapter-extensions-expandable-3.0.3.aar:5f4b78a877ab9e44e7f15dd69decbfcfc38ba45359bb6ee659d5043fdd931a7b', - 'com.mikepenz:fastadapter:3.0.0:fastadapter-3.0.0.aar:6a75d94586448e9222fc36a3e0a0a6d61d3bd30bedb125f681a956b310816e7e', 'com.mikepenz:iconics-core:2.9.5:iconics-core-2.9.5.aar:4250d3082eb20029137574f2f9240bfc6a1f0dd2ce72b7290e75bea8a9cf3b14', 'com.mikepenz:materialdrawer:6.0.0:materialdrawer-6.0.0.aar:e3c43bf540fa220c90108c96e6f6c76ccc971fb100cb4616158650a495a44bf3', 'com.mikepenz:materialize:1.1.1:materialize-1.1.1.aar:0b85d3df906c36ad423271efdaafd4fa3dfb6211400ee91328201c341e7028b8', diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java index 639c1c9d2..a4653e78f 100644 --- a/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java @@ -22,14 +22,8 @@ import android.content.Context; import android.support.annotation.IdRes; import android.support.annotation.LayoutRes; -import android.support.v4.view.ViewCompat; import android.view.View; -import com.mikepenz.fastadapter.IItem; -import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem; -import com.mikepenz.fastadapter.listeners.OnClickListener; - -import java.util.Comparator; import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; @@ -37,7 +31,7 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -class ContinentItem extends ParentRegionItem { +class ContinentItem extends ParentRegionItem { private final Continent continent; @@ -64,7 +58,7 @@ public int getLayoutRes() { } @Override - public void bindView(RegionViewHolder ui, List payloads) { + public void bindView(ContinentViewHolder ui, List payloads) { super.bindView(ui, payloads); ui.bind(continent, isExpanded()); } diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java index 33a59b072..928ca6eb8 100644 --- a/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentViewHolder.java @@ -30,7 +30,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; -class ContinentViewHolder extends ParentRegionViewHolder { +class ContinentViewHolder extends ParentRegionViewHolder { private final ImageView contour; @@ -39,9 +39,9 @@ class ContinentViewHolder extends ParentRegionViewHolder { contour = v.findViewById(R.id.contour); } - void bind(Region region, boolean expanded) { - super.bind(region, expanded); - Continent continent = (Continent)region; + @Override + void bind(Continent continent, boolean expanded) { + super.bind(continent, expanded); contour.setImageResource(continent.getContour()); } } diff --git a/app/src/main/java/de/grobox/transportr/networks/Country.java b/app/src/main/java/de/grobox/transportr/networks/Country.java index a3c984009..8afad7e09 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Country.java +++ b/app/src/main/java/de/grobox/transportr/networks/Country.java @@ -44,7 +44,7 @@ enum Country implements Region { IRELAND(R.string.np_region_ireland, "🇮🇪", Continent.EUROPE), POLAND(R.string.np_region_poland, "🇵🇱", Continent.EUROPE), UAE(R.string.np_region_uae, "🇦🇪", Continent.ASIA), - USA(R.string.np_region_usa, "🇺🇸", Continent.NORTH_AMERICA), + USA(R.string.np_region_usa, "🇺🇸", Continent.NORTH_AMERICA), //TODO: it seems there's a problem with the flag AUSTRALIA(R.string.np_region_australia, "🇦🇺", Continent.OCEANIA), FRANCE(R.string.np_region_france, "🇫🇷", Continent.EUROPE), BRAZIL(R.string.np_region_br, "🇧🇷", Continent.SOUTH_AMERICA), diff --git a/app/src/main/java/de/grobox/transportr/networks/CountryItem.java b/app/src/main/java/de/grobox/transportr/networks/CountryItem.java index 338f46c63..1e006d6a9 100644 --- a/app/src/main/java/de/grobox/transportr/networks/CountryItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/CountryItem.java @@ -22,11 +22,8 @@ import android.content.Context; import android.support.annotation.IdRes; import android.support.annotation.LayoutRes; -import android.support.v4.view.ViewCompat; import android.view.View; -import com.mikepenz.fastadapter.listeners.OnClickListener; - import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; @@ -34,7 +31,7 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -class CountryItem extends ParentRegionItem { +class CountryItem extends ParentRegionItem { protected final Country country; @@ -61,13 +58,13 @@ public int getLayoutRes() { } @Override - public void bindView(RegionViewHolder ui, List payloads) { + public void bindView(CountryViewHolder ui, List payloads) { super.bindView(ui, payloads); ui.bind(country, isExpanded()); } @Override - public RegionViewHolder getViewHolder(View view) { + public CountryViewHolder getViewHolder(View view) { return new CountryViewHolder(view); } diff --git a/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java index c43b26e3d..50932d533 100644 --- a/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/CountryViewHolder.java @@ -30,7 +30,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; -class CountryViewHolder extends ParentRegionViewHolder { +class CountryViewHolder extends ParentRegionViewHolder { private final TextView flag; @@ -40,9 +40,8 @@ class CountryViewHolder extends ParentRegionViewHolder { } @Override - void bind(Region region, boolean expanded) { - super.bind(region, expanded); - Country country = (Country)region; + void bind(Country country, boolean expanded) { + super.bind(country, expanded); if (Build.VERSION.SDK_INT >= 21) { flag.setText(country.getFlag()); flag.setVisibility(VISIBLE); diff --git a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java index 6c6b3a176..b3c5bbd28 100644 --- a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java +++ b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java @@ -23,12 +23,10 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.ActionBar; -import android.support.v7.util.SortedList; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.MenuItem; -import com.google.common.collect.RowSortedTable; import com.mikepenz.fastadapter.IItem; import com.mikepenz.fastadapter.ISelectionListener; import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter; @@ -82,18 +80,18 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } setResult(RESULT_CANCELED); - adapter = new FastItemAdapter<>(); adapter.withSelectable(true); - adapter.getItemAdapter().withComparator(new RegionItem.RegionComparator(this)); adapter.withSelectionListener(this); expandableExtension = new ExpandableExtension<>(); + expandableExtension.withOnlyOneExpandedItem(true); adapter.addExtension(expandableExtension); list = findViewById(R.id.list); list.setLayoutManager(new LinearLayoutManager(this)); list.setAdapter(adapter); Map> regions = getRegionsByRegion(); + List continentItems = new ArrayList<>(Continent.values().length); for (Continent continent : Continent.values()) { if (!regions.containsKey(continent)) { continue; @@ -109,7 +107,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } CountryItem countryItem = new CountryItem(country); List networks = regions.get(country); - List networkItems = new ArrayList<>(networks.size()); + List networkItems = new ArrayList<>(networks.size()); for (Region network : networks) { if (!(network instanceof TransportNetwork)) continue; @@ -125,9 +123,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { Collections.sort(subRegionItems, new RegionItem.RegionComparator(this)); continentItem.withSubItems(subRegionItems); - adapter.add(continentItem); + continentItems.add(continentItem); } + Collections.sort(continentItems, new RegionItem.RegionComparator(this)); + for (ContinentItem c : continentItems) { + adapter.add(c); + } if (savedInstanceState != null) adapter.withSavedInstanceState(savedInstanceState); selectItem(); diff --git a/app/src/main/java/de/grobox/transportr/networks/RegionItem.java b/app/src/main/java/de/grobox/transportr/networks/RegionItem.java index b1f798ed4..82d5d8c59 100644 --- a/app/src/main/java/de/grobox/transportr/networks/RegionItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/RegionItem.java @@ -20,14 +20,8 @@ package de.grobox.transportr.networks; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; import android.support.v4.view.ViewCompat; -import android.view.View; -import com.mikepenz.fastadapter.IItem; -import com.mikepenz.fastadapter.adapters.ItemAdapter; -import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter; import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem; import com.mikepenz.fastadapter.listeners.OnClickListener; @@ -39,11 +33,11 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -abstract class RegionItem extends AbstractExpandableItem { +abstract class RegionItem extends AbstractExpandableItem { protected abstract String getName(Context context); - static class RegionComparator implements Comparator { + static class RegionComparator implements Comparator { private final Context context; @@ -53,32 +47,25 @@ static class RegionComparator implements Comparator { } @Override - public int compare(IItem i1, IItem i2) { - if (i1 instanceof RegionItem && i2 instanceof RegionItem) { - // sort regions alphabetically - return ((RegionItem) i1).getName(context).compareTo(((RegionItem) i2).getName(context)); - } - return 0; + public int compare(RegionItem r1, RegionItem r2) { + // sort regions alphabetically + return r1.getName(context).compareTo(r2.getName(context)); } } } -abstract class ParentRegionItem extends RegionItem { +abstract class ParentRegionItem extends RegionItem { @Override - public OnClickListener getOnItemClickListener() { + public OnClickListener getOnItemClickListener() { return (v, adapter, item, position) -> { if (item.getSubItems() != null) { if (!item.isExpanded()) { - List subItems = item.getSubItems(); - for (RegionItem subItem : subItems) { + List subItems = item.getSubItems(); + for (Child subItem : subItems) { if (subItem.getSubItems() != null && subItem.isExpanded()) { - boolean test = subItem.isExpanded(); - subItem.withIsExpanded(false); - test = subItem.isExpanded(); subItem.withIsExpanded(false); - test = subItem.isExpanded(); - ((ItemAdapter)adapter).getFastAdapter().notifyAdapterDataSetChanged(); + adapter.getFastAdapter().notifyAdapterDataSetChanged(); } } ViewCompat.animate(v.findViewById(R.id.chevron)).rotation(180).start(); diff --git a/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java index 5757e3c07..d716ad158 100644 --- a/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/RegionViewHolder.java @@ -26,7 +26,7 @@ import de.grobox.transportr.R; -abstract class RegionViewHolder extends RecyclerView.ViewHolder { +abstract class RegionViewHolder extends RecyclerView.ViewHolder { protected final TextView name; RegionViewHolder(View v) { @@ -34,12 +34,12 @@ abstract class RegionViewHolder extends RecyclerView.ViewHolder { name = v.findViewById(R.id.name); } - void bind(Region region, boolean expanded) { + void bind(Reg region, boolean expanded) { name.setText(region.getName(name.getContext())); } } -abstract class ParentRegionViewHolder extends RegionViewHolder { +abstract class ParentRegionViewHolder extends RegionViewHolder { protected final ImageView chevron; ParentRegionViewHolder(View v) { @@ -47,7 +47,8 @@ abstract class ParentRegionViewHolder extends RegionViewHolder { chevron = v.findViewById(R.id.chevron); } - void bind(Region region, boolean expanded) { + @Override + void bind(Reg region, boolean expanded) { super.bind(region, expanded); if (expanded) chevron.setRotation(0); else chevron.setRotation(180); diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java index ed0b1d267..ad7f7def9 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkItem.java @@ -24,10 +24,6 @@ import android.support.annotation.LayoutRes; import android.view.View; -import com.mikepenz.fastadapter.IItem; -import com.mikepenz.fastadapter.ISubItem; -import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem; - import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; @@ -35,7 +31,7 @@ import de.grobox.transportr.R; @ParametersAreNonnullByDefault -class TransportNetworkItem extends RegionItem { +class TransportNetworkItem extends RegionItem { protected final TransportNetwork network; @@ -62,7 +58,7 @@ public int getLayoutRes() { } @Override - public void bindView(RegionViewHolder ui, List payloads) { + public void bindView(TransportNetworkViewHolder ui, List payloads) { super.bindView(ui, payloads); ui.bind(network, false); } diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java index 32f3ff425..c60fca918 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkViewHolder.java @@ -31,7 +31,7 @@ import static de.grobox.transportr.networks.TransportNetwork.Status.ALPHA; import static de.grobox.transportr.networks.TransportNetwork.Status.STABLE; -class TransportNetworkViewHolder extends RegionViewHolder { +class TransportNetworkViewHolder extends RegionViewHolder { private final ImageView logo; private final TextView desc; @@ -45,9 +45,8 @@ class TransportNetworkViewHolder extends RegionViewHolder { } @Override - void bind(Region region, boolean expanded) { - super.bind(region, expanded); - TransportNetwork network = (TransportNetwork)region; + void bind(TransportNetwork network, boolean expanded) { + super.bind(network, expanded); logo.setImageResource(network.getLogo()); desc.setText(network.getDescription(desc.getContext())); if (network.getStatus() == STABLE) { From 8711af37f495918ec225842efd6fb91b53302824 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Tue, 6 Feb 2018 23:27:18 -0600 Subject: [PATCH 4/9] fix PickTransportNetworkActivityTest and transport_network logo width --- .../networks/PickTransportNetworkActivityTest.kt | 7 +------ app/src/main/res/layout/list_item_transport_network.xml | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt index 9c36d585e..062b0aa14 100644 --- a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt +++ b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt @@ -73,14 +73,9 @@ class PickTransportNetworkActivityTest : ScreengrabTest() { .check(matches(withText(R.string.pick_network_first_run))) makeScreenshot("1_FirstStart") - // hack to find region position in list - val regionList = ArrayList(EnumSet.allOf(Country::class.java)) //TODO: pretty sure it will break :/ - val context = InstrumentationRegistry.getTargetContext() - Collections.sort(regionList) { r1, r2 -> context.getString(r1.getName()).compareTo(context.getString(r2.getName())) } - // select DB network provider onView(withId(R.id.list)) - .perform(scrollToPosition(regionList.indexOf(Country.GERMANY) + 5)) + .perform(actionOnItem(withChild(withText(R.string.np_continent_europe)), click())) .perform(actionOnItem(withChild(withText(R.string.np_region_germany)), click())) .perform(actionOnItem(withChild(withText(R.string.np_name_db)), click())) } diff --git a/app/src/main/res/layout/list_item_transport_network.xml b/app/src/main/res/layout/list_item_transport_network.xml index 074aa53f3..cb1db8785 100644 --- a/app/src/main/res/layout/list_item_transport_network.xml +++ b/app/src/main/res/layout/list_item_transport_network.xml @@ -11,8 +11,8 @@ Date: Wed, 7 Feb 2018 11:52:21 -0600 Subject: [PATCH 5/9] simplified svg and xml continent contour lines --- .../main/res/drawable/continent_africa.xml | 18 +- app/src/main/res/drawable/continent_asia.xml | 18 +- .../drawable/continent_central_america.xml | 18 +- .../main/res/drawable/continent_europe.xml | 18 +- .../res/drawable/continent_north_america.xml | 18 +- .../main/res/drawable/continent_oceania.xml | 18 +- .../res/drawable/continent_south_america.xml | 18 +- artwork/continent_africa.svg | 218 +----------------- artwork/continent_asia.svg | 216 +---------------- artwork/continent_central_america.svg | 216 +---------------- artwork/continent_europe.svg | 216 +---------------- artwork/continent_north_america.svg | 216 +---------------- artwork/continent_oceania.svg | 216 +---------------- artwork/continent_south_america.svg | 216 +---------------- 14 files changed, 85 insertions(+), 1555 deletions(-) diff --git a/app/src/main/res/drawable/continent_africa.xml b/app/src/main/res/drawable/continent_africa.xml index 9285bf55d..fb504157e 100644 --- a/app/src/main/res/drawable/continent_africa.xml +++ b/app/src/main/res/drawable/continent_africa.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="538.6851" + android:viewportHeight="645.0074" + android:width="538.68512dp" + android:height="645.00739dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_asia.xml b/app/src/main/res/drawable/continent_asia.xml index e9d519c7d..ab518e099 100644 --- a/app/src/main/res/drawable/continent_asia.xml +++ b/app/src/main/res/drawable/continent_asia.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="950.9475" + android:viewportHeight="787.0276" + android:width="950.94751dp" + android:height="787.02759dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_central_america.xml b/app/src/main/res/drawable/continent_central_america.xml index 0291492ee..6bf28ae0e 100644 --- a/app/src/main/res/drawable/continent_central_america.xml +++ b/app/src/main/res/drawable/continent_central_america.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="136.3652" + android:viewportHeight="125.4169" + android:width="136.36523dp" + android:height="125.41689dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_europe.xml b/app/src/main/res/drawable/continent_europe.xml index a7ba78b58..03395929b 100644 --- a/app/src/main/res/drawable/continent_europe.xml +++ b/app/src/main/res/drawable/continent_europe.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="423.7945" + android:viewportHeight="337.6692" + android:width="423.79449dp" + android:height="337.66916dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_north_america.xml b/app/src/main/res/drawable/continent_north_america.xml index 86fdb062c..720233b8e 100644 --- a/app/src/main/res/drawable/continent_north_america.xml +++ b/app/src/main/res/drawable/continent_north_america.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="845.6545" + android:viewportHeight="565.9996" + android:width="845.65448dp" + android:height="565.99963dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_oceania.xml b/app/src/main/res/drawable/continent_oceania.xml index 1b5300627..dd87971d6 100644 --- a/app/src/main/res/drawable/continent_oceania.xml +++ b/app/src/main/res/drawable/continent_oceania.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="458.9524" + android:viewportHeight="454.8092" + android:width="458.95242dp" + android:height="454.80923dp"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_south_america.xml b/app/src/main/res/drawable/continent_south_america.xml index ec70747ba..a580d18f1 100644 --- a/app/src/main/res/drawable/continent_south_america.xml +++ b/app/src/main/res/drawable/continent_south_america.xml @@ -1,14 +1,10 @@ - - - + android:viewportWidth="378.4156" + android:viewportHeight="610.44" + android:width="378.41562dp" + android:height="610.44dp"> + \ No newline at end of file diff --git a/artwork/continent_africa.svg b/artwork/continent_africa.svg index dd2dee5cd..5b336c7b1 100644 --- a/artwork/continent_africa.svg +++ b/artwork/continent_africa.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - - + + d="m 214.62874,10 c -30.6305,1.42763 -61.7999,0.84337 -88.5736,17.89075 -16.4448,-5.66816 -27.922096,-1.95183 -35.081696,11.35931 -22.8063,10.88936 -14.5516,46.829194 -42.5078,52.943884 -14.450806,20.781176 -41.1092053,46.531386 -28.701806,72.833706 1.4457,26.00138 -21.2189993,44.141 -1.9809,66.06526 15.1073,-0.23363 20.5331,32.35991 35.384006,45.50076 18.527,26.51205 47.161596,15.23162 72.464696,15.09745 22.1523,-4.82105 51.4612,-29.33518 61.7782,4.16413 25.0032,-14.04853 38.034,30.30727 20.0218,42.5551 11.0621,24.28808 31.3179,44.85661 34.1992,72.87249 10.9604,31.5683 -25.8717,58.73837 -7.2399,89.90658 20.0531,24.85866 9.1412,58.79265 28.9161,83.44667 13.5753,20.8407 4.3137,63.8253 43.092,46.2429 29.1991,3.245 54.2772,-16.293 68.2268,-40.7545 18.6511,-12.2919 3.3475,-43.0946 29.7124,-46.39433 8.0339,-20.57169 -12.316,-45.73156 17.2474,-56.0187 31.02,-8.06212 31.393,-43.02275 24.0289,-66.5604 -15.0496,-28.1345 -2.8916,-56.20902 15.996,-79.19872 16.5758,-23.45028 44.3438,-37.52646 54.61,-65.9697 10.0995,-16.43731 25.7015,-58.62637 -8.5112,-39.88071 -16.3269,2.67892 -38.5161,14.75198 -38.1844,-12.62644 -23.5852,-16.37171 -36.5365,-39.04417 -47.7096,-66.38673 0.1428,-26.23491 -36.6894,-48.74928 -21.3932,-72.903966 3.877,-40.002354 -40.1416,-18.13883 -61.7582,-24.12179 -17.539,-9.119224 -51.0148,-23.355734 -53.1682,6.48243 C 261.45354,64.617024 245.27894,42.21702 219.51184,41.56996 218.27894,28.70923 231.47794,13.1735 214.62874,10 Z m 157.5462,48.204154 0.1253,0.0701 z M 45.490644,93.608374 h -0.087 z m 79.013996,-65.033684 -0.3014,-0.34606 z m 98.4975,11.19066 c -4.2808,2.32982 3.9892,1.62441 0,0 z m 152.1214,18.978074 c 1.0481,1.21896 -1.9782,-0.009 0,0 z m -1.6262,0.99996 c 2.8413,0.74684 -2.3867,0.96986 0,0 z m 10.0293,4.78963 c 9.0849,1.4785 -6.2276,5.74926 0,0 z m -339.002296,82.820716 -0.1528,0.44158 z m -27.858806,0.97232 4.5868,7.5e-4 z m 406.014702,9.09519 v 0.0764 z m -403.817302,3.72599 c -1.9972,0.97538 0.6671,4.9408 0,0 z m 424.861102,34.44882 c -2.5274,3.55554 7.4291,3.48667 0,0 z M 13.500038,218.55062 c 3.6619,1.96241 -3.5368997,4.1033 0,0 z m 8.0697,5.81295 c 1.1274,1.05532 -1.4259,0.87525 0,0 z m -4.5666,5.48812 c -0.5189,1.88818 1.8772,-0.48223 0,0 z m 2.1591,0.28873 c -2.5715,-1.33194 0.2825,2.5294 0,0 z m 14.1247,1.92775 c 5.548,-0.45224 -9.1359,1.78631 0,0 z m -16.5343,1.02544 c -2.4293,0.1396 0.9053,1.42442 0,0 z m 2.3395,0.21442 c -1.405,2.06978 2.4807,-0.36017 0,0 z m 9.8681,0.33545 -1.1673,1.86982 z m -7.2078,1.5371 -0.7899,1.225 z m 2.4649,0.6539 c -1.5819,0.13192 1.7642,1.50076 0,0 z m -6.2525,0.67514 c -1.9752,1.53127 2.8772,0.79053 0,0 z m 8.6069,1.67297 c -1.6561,2.88052 2.7424,0.13665 0,0 z m 26.582906,8.09949 -0.064,0.0248 z m 0.3397,0.0361 0.5053,0.0743 z m -4.2907,0.80464 -0.327,0.0955 z m -2.8046,0.30148 -0.068,0.0212 z m 10.3393,0.80251 1.5327,2.55402 z m -16.576906,6.32886 -0.1847,0.017 z m -0.397,0.0679 -0.091,0.034 z m 20.464306,0.66876 v 0.16984 z m 0.3757,2.45214 -0.04,0.21018 z m -16.9208,9.26293 c -5.061606,0.63231 5.4912,1.8662 0,0 z m 101.257396,14.29671 c 0.1097,3.37264 -2.7619,-0.0308 0,0 z m 58.2803,9.00179 c 1.5527,0.23823 -0.8769,1.87928 0,0 z m -7.5284,3.53065 c -2.8482,1.65599 1.877,1.38962 0,0 z m 2.1591,0.36092 c -3.3931,-0.0109 -0.368,0.99503 0,0 z m 16.9357,5.63037 0.051,0.45009 z m -6.8384,0.60082 c -7.9871,2.98302 2.3813,7.46043 0,0 z m -10.9869,17.81888 c -1.7223,0.88759 1.6685,2.97618 0,0 z m -4.1102,0.72396 c -23.1739,16.34225 22.7988,14.63751 0,0 z m 24.9905,5.04015 3.7832,0.0729 z m -0.9681,0.19533 -0.6029,0.10402 z m 177.9213,8.58567 c 18.6922,18.67151 -24.3355,35.85554 -9.1152,5.51665 1.1747,-4.75713 6.3059,-3.11648 9.1152,-5.51665 z m -185.8531,5.54756 0.1972,1.26406 z m 156.1301,34.83948 c 5.7547,15.57385 11.707,36.03641 0.8642,11.26211 l -0.2652,-5.69258 z m 78.2286,2.3099 c -1.6959,4.19481 3.7885,5.32452 0,0 z m -2.8088,7.1993 c -3.4709,6.37251 5.5416,6.19339 0,0 z m 3.8194,16.99088 c -3.5523,2.63503 -0.065,3.50123 0,0 z m -68.6599,2.64746 c 4.9419,4.37319 -1.9493,3.98343 0,0 z m 24.3856,13.10142 c 12.5353,9.34666 0.5533,45.43428 2.8507,14.60687 0.7082,-4.97042 0.5552,-10.54564 -2.8507,-14.60687 z m 44.8752,10.70237 -0.482,0.30572 z m -3.9745,2.43303 c -2.2037,1.31735 -1.6964,1.01412 0,0 z m 32.7228,1.63052 c -22.6121,13.30958 22.0257,16.76755 0,0 z m -43.508,0.19744 0.2221,0.0902 z m 3.8003,0.95325 -0.1,0.0446 z m -5.711,0.57111 -0.2335,0.29935 z m -15.4962,0.27387 -0.6878,0.35668 z m -4.6347,1.13797 0.8917,0.0297 z m 14.4199,0.41399 0.3396,0.30147 z m 3.4541,0.34769 c -2.8605,0.69679 -1.7203,0.41906 0,0 z m -9.5728,0.20382 1.484,0.16984 z m 98.0325,2.32688 c -5.4679,22.61953 -24.3092,31.25113 -40.2439,41.82703 8.4251,25.76743 -24.6727,57.47949 4.3408,75.82891 28.3554,-7.87684 23.0665,-45.38599 35.0182,-66.98526 4.9318,-19.09082 13.7802,-31.7672 0.8849,-50.67068 z m -7.7131,10.56648 c -2.1864,1.73758 3.4233,2.55496 0,0 z m 11.8106,30.17086 c -2.2079,1.70654 -0.4682,4.86705 0,0 z m -103.6331,18.31355 c -1.558,-0.53209 0.8265,1.96713 0,0 z m -7.297,23.61696 c -0.4843,3.0056 -0.3419,2.12177 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.5" /> diff --git a/artwork/continent_asia.svg b/artwork/continent_asia.svg index d7cc2bd07..c347729dd 100644 --- a/artwork/continent_asia.svg +++ b/artwork/continent_asia.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="787.02759" + width="950.94751" + version="1.1"> + d="m 131.02564,14.99949 c -18.0264,7.41954 -88.427395,7.469168 -33.348099,13.609214 13.711699,2.90409 84.049899,-0.29938 53.713799,-12.242059 -7.5622,0.258557 -13.2582,1.818039 -20.3657,-1.367155 z m 173.2441,2.955303 c -40.3259,14.123871 28.322,19.018881 43.1189,20.779931 22.544,3.76308 34.7113,1.14465 4.7401,7.68914 -28.8106,-2.70546 -69.4982,19.84171 -91.4652,27.66067 -8.4566,-25.95617 -14.4851,22.13245 -20.4127,-0.83242 -37.4076,-28.0493 -8.2921,50.378636 -49.7949,20.96008 -31.1251,2.34213 -51.7543,-30.03355 -12.2222,-35.58738 28.1145,-1.9951 30.3508,-20.49358 0.5371,-12.22844 -39.1895,-9.40445 -72.8521,53.690486 -17.6221,45.01754 31.4492,13.937756 -41.7054,8.31757 -47.3221,20.607456 -14.579599,-25.164286 -17.503699,4.64311 -19.306799,5.35233 -12.3595,15.62634 -65.818596,10.81228 -24.1894,5.64841 41.808999,-11.72172 -33.433896,-30.817776 -48.692196,-29.047956 -37.6254,9.661666 31.4176,60.955166 -6.9593,72.529626 -15.34430039,36.62678 32.5028,39.11148 37.0253,68.97534 18.117996,15.0428 73.604095,16.552 41.125796,46.36057 -19.928,19.44413 60.084499,38.85529 13.916899,44.55014 -29.133499,-13.1028 -62.955895,-5.34942 -88.453895,-1.76392 -6.6471,34.16701 19.9407,51.70877 50.245396,46.30732 6.3407,3.62377 -17.617096,15.96885 5.9717,14.70079 17.7653,-9.1933 17.7002,-17.6982 12.9143,6.45457 -18.523,41.64215 24.992599,74.37649 40.396899,109.72546 22.3221,21.91905 17.3076,59.41674 41.376,72.25427 37.7246,-14.94863 80.8642,-32.234 103.825,-67.01323 25.4508,-20.79705 -37.7858,-49.1375 -16.5315,-48.69657 27.5464,18.13592 80.868,-7.46623 96.0957,39.97834 43.9142,8.38385 28.7475,71.8564 56.5794,101.00901 12.8421,21.07944 32.5518,-5.4147 32.106,29.42208 34.6136,6.33938 -24.3939,-58.62443 3.045,-81.53198 22.6026,-21.85405 63.0237,-82.55193 86.9344,-32.55783 10.7612,13.00429 10.6717,50.48594 28.0972,26.58161 25.7847,24.91086 4.3933,70.47273 35.8805,95.51451 9.69,17.46305 12.196,35.4126 -8.7298,11.63799 -20.1198,-31.45181 -42.5969,-9.51419 -13.8785,13.21724 -4.2163,25.75946 19.4206,-0.14605 8.7779,26.40688 4.1333,17.54813 27.6706,36.61545 9.5576,7.36425 -8.6558,-24.35337 22.2058,30.32073 31.5213,36.95866 18.1038,17.52055 59.3284,26.52429 95.0209,29.46521 19.4448,2.70725 33.9208,17.035 29.727,-2.61726 20.9658,3.03713 43.671,-7.13829 16.1284,17.82008 16.653,-6.06071 58.1813,-40.92251 13.2357,-26.67989 -27.8106,4.29345 -53.0223,5.1881 -79.1709,-3.79327 36.1723,-12.07257 -55.9547,1.78569 -58.2874,-22.80286 6.1391,-16.77312 32.6826,-17.05578 1.9124,-24.87925 -17.0131,-19.13055 -9.6662,-63.69761 -41.4378,-83.02321 -18.0742,-13.90635 -12.9697,-68.434 11.8118,-30.08703 16.7276,53.65821 80.5193,-17.62822 35.8756,-44.99711 -29.2757,-8.08073 -8.2637,-62.37433 7.0591,-32.85138 -26.2849,20.7913 30.5949,19.99913 8.0973,-2.60289 34.9428,-9.56119 74.2692,-40.90323 69.0166,-84.2368 -6.1873,-18.87294 -51.0955,-40.63519 -17.9237,-61.55393 -20.4822,0.22263 -61.7666,-11.65573 -22.7714,-24.815 0.01,29.89683 34.478,-10.70917 32.7628,22.17545 17.3117,3.33953 24.4463,52.88416 42.8826,18.38927 -12.4506,-21.0089 -41.6391,-49.42053 -7.0271,-61.44646 44.4229,-5.62126 -4.4624,-102.97589 31.0909,-47.45474 19.2069,30.72119 21.121,55.21744 32.2968,87.52743 -9.3297,3.00036 -12.0671,19.48039 -35.1834,14.80413 2.5158,26.918 -31.2937,8.97921 -18.6387,26.57361 4.9852,12.24888 31.216,42.37936 28.1786,4.8329 31.6007,-8.29807 64.2991,-21.60298 42.5664,-61.23819 -17.3046,-17.76663 -19.9281,-20.25846 3.3339,-25.50142 3.9967,-16.19711 32.0541,-39.61062 0.7606,-20.07619 -28.8816,16.8009 -30.7745,-15.42023 -43.4384,-27.48731 20.7901,-5.52303 -28.2652,-33.36738 -40.3497,-51.17278 -2.4084,11.85434 -30.4343,-4.79438 -48.6301,-6.62595 4.6502,-52.82989 65.4773,-14.06669 85.9173,-35.23845 -14.8609,-30.80957 31.1899,5.68432 33.1953,-12.53432 -27.0222,36.98141 21.3497,62.72628 35.1523,83.95849 -1.7327,21.65006 6.5213,37.74942 8.8643,4.98113 5.3322,-30.05396 8.7049,-51.28955 -20.2066,-66.78065 15.9379,-2.63117 -15.582,-12.49647 11.0175,-12.56032 23.7775,9.62293 37.9886,-25.10545 45.2655,-25.45289 -42.5505,-13.41124 13.5607,-18.64465 28.4387,-6.10512 14.7583,-29.93519 -59.3908,-24.71164 -81.4026,-37.54784 -39.6782,-14.762726 -81.1971,-4.163156 -121.7465,-6.362736 -40.3167,-19.07197 -92.4678,-6.29183 -133.8785,-28.24358 -31.6434,-11.7245 9.0826,24.70082 -29.1218,15.36584 -22.5878,9.74574 -54.8879,-31.40062 -81.2905,-10.68995 -46.161,-3.452 -77.5288,-28.54843 -125.4716,-38.89962 -22.3539,-0.007 -40.3796,-8.23053 -61.8394,-13.939631 z m -20.1585,0.127385 c -24.1757,-0.895952 17.7699,10.074616 0,0 z m -51.928,1.471282 c -17.0833,9.284384 23.3002,1.946871 0,0 z m 62.4987,1.093379 c 3.6027,-0.317108 -2.0702,1.89512 0,0 z m -75.8124,6.522055 c 13.3213,14.4847 26.5061,-2.80743 0,0 z m 100.5376,0.68575 c 5.2698,-0.48651 -3.3609,3.62873 0,0 z m 58.7728,12.55155 0.4216,0.2179 z m -113.8111,0.38215 c -11.7495,2.41378 -0.6943,3.4304 5.1128,2.16714 z m 117.0169,0.32483 2.9631,0.34807 z m -80.0118,0.97661 c -14.0207,12.33555 25.5828,0.33093 0,0 z m 301.8041,3.44573 c -14.0676,6.72855 15.0849,5.35376 0,0 z m 24.4003,3.69201 c -14.209,4.34129 15.8524,6.12941 0,0 z m -70.7977,0.12738 c -32.6839,6.85908 34.3118,23.80701 43.2001,7.87657 16.3468,14.24869 47.7579,-3.71702 12.3086,-3.03202 -18.5818,-0.62501 -37.0032,-3.2584 -55.5087,-4.84455 z m -281.5437,1.24412 c -28.1033,3.25541 23.9863,16.11429 0,0 z m 58.847,2.67293 c 6.8248,-2.84609 -0.4191,6.07577 0,0 z m -69.1716,6.51356 c -18.5271,4.63434 18.5839,5.46755 0,0 z m 288.2718,1.93199 c 8.7208,13.687 26.4479,2.69235 0,0 z m -121.7301,1.91076 c 1.8542,1.87718 -3.8194,-0.61593 0,0 z m -10.6663,2.54131 c 6.4769,1.42646 -3.9936,2.47273 0,0 z m 2.7557,2.26955 c 2.0547,0.8111 -2.3253,0.92511 0,0 z m -146.5444,5.01892 c 6.1571,0.10024 -0.8856,5.16252 0,0 z m 366.9566,5.20787 c 1.3321,1.32842 -2.0774,-0.11406 0,0 z m 180.4924,2.00418 c -15.1025,22.014246 40.2013,-1.16296 0,0 z m -234.3566,3.71749 0.554,0.75689 z m -339.7602,3.54551 c 12.1402,9.74531 3.8216,19.503886 0,0 z m -77.9972,1.90014 -0.4954,0.0658 z m 623.7562,3.50093 c 4.3099,-0.0768 -1.8856,2.20223 0,0 z m -9.5326,2.12944 c 4.8152,1.2312 -1.9287,5.931116 0,0 z m -664.899,0.30997 c -15.7431,19.833976 28.1368,0.78518 0,0 z m 58.8896,2.15491 c 14.6112,0.48712 2.7063,8.455856 0,0 z m 612.1026,1.3906 3.3429,1.640226 z m -748.515795,0.0849 c 1.9213,1.365686 -2.3877,0.29154 0,0 z m 180.589895,0.0446 c 22.2047,7.203996 -10.8563,1.281956 0,0 z m -39.9434,1.080646 0.021,0.0212 z m 663.984,0.16984 c 4.2638,1.97817 -3.9205,1.5821 0,0 z m -663.7546,0.0467 0.01,0.0106 z m 3.0444,0.55624 -0.013,1.0212 z m 671.3489,0.78979 c 9.1753,2.05325 -6.2181,4.61721 0,0 z m -597.2263,0.75581 c 13.0766,8.10784 -4.1522,22.22885 0,0 z m -105.8326,1.08487 c 2.9841,-1.69895 -0.1171,2.31811 0,0 z m 76.0098,0.0913 0.6442,0.25669 z m -78.5957,0.16348 -0.043,0.0892 z m 717.536,1.40971 c 2.5406,6.37952 -3.0662,1.67818 0,0 z m 8.0443,1.18467 c 6.5938,2.991 -5.7486,3.14417 0,0 z m 9.0422,2.73875 c 2.7023,0.841 -1.8757,1.2706 0,0 z m 6.0826,4.99982 c 4.3859,-0.6026 -1.435,3.70294 0,0 z m 23.8291,0.69424 c 5.0953,3.1063 -6.6449,1.08566 0,0 z m -657.3301,1.97869 c 4.788,2.78447 -6.2567,2.19061 0,0 z m 620.8581,4.19093 c 4.1652,0.0929 -1.9491,2.35974 0,0 z m -835.733395,0.29298 0.641,0.53186 z m -0.3567,1.02544 0.4896,0.49205 z m 1.7388,0.51591 0.2548,0.11464 z m 879.952595,4.67074 c 5.3461,-0.29583 -3.5305,3.54802 0,0 z m -850.416499,2.02115 c 10.0943,2.69276 -5.4783,3.35635 0,0 z m -18.504696,2.63048 c 22.077296,9.18928 -11.0989,2.11641 0,0 z m 8.925396,5.52421 -0.3086,0.18244 z m 838.932799,6.38617 c 3.0172,-0.88085 -0.7727,2.45375 0,0 z m 0.603,1.18468 c 2.716,0.93078 -2.2067,1.44665 0,0 z m 2.3736,4.11237 c 4.3178,2.14291 -4.4651,1.52053 0,0 z m -84.3026,1.34178 c 4.2092,4.51006 -4.1997,1.74738 0,0 z m -764.215895,4.31831 c -0.6534,4.51339 -6.1676,-3.22751 0,0 z m 741.866395,1.02757 c 5.7151,0.52363 -2.3513,2.626 0,0 z m -738.794299,2.48823 0.3375,0.31421 z m -30.028596,0.11039 c 24.3089,5.74488 0.4457,16.01659 0,0 z m 763.328395,16.05249 c 5.4511,3.70628 -6.0225,0.71616 0,0 z m 102.8328,30.5615 c -4.4838,15.74611 50.6171,12.73259 0,0 z m -359.3265,4.80874 c 6.198,17.79159 -9.8631,21.46123 0,0 z m 190.8464,9.53043 0.03,0.1932 z m 36.3638,3.81939 c 2.7262,0.0438 -1.6755,2.29164 0,0 z m 2.7133,0.8556 0.9894,0.56261 z m -1.6539,2.46063 0.3738,0.53926 z m 6.6517,5.12508 c 1.9471,3.88442 1.1183,2.23101 0,0 z m 2.0827,1.07639 0.051,0.0594 z m 0.242,0.276 0.06,0.0658 z m -244.9718,0.47769 c 1.8358,2.98051 -3.6687,2.45789 0,0 z m 244.5854,1.98506 0.04,0.20806 z m 3.1825,1.00421 0.1443,0.61144 z m -12.9549,1.36938 1.191,0.84709 z m -118.9617,34.10489 c 1.8177,0.93326 -2.1164,1.61563 0,0 z m 154.126,0.77279 c 7.7444,2.98957 -5.0027,3.34464 0,0 z m 65.9741,0.3588 c -16.6898,4.40041 8.0108,12.81663 0,0 z m -683.4587,4.49877 c 28.1654,2.92538 -22.9159,28.35753 8.8213,34.03696 12.711,16.74774 37.6642,64.63105 -4.8402,44.79464 0.8712,-17.1999 -1.7103,-34.78767 -21.5345,-47.92687 -8.7034,-13.39325 6.5731,-25.71047 17.5534,-30.90473 z m 64.367,1.8492 -0.1804,0.28661 z m 3.4203,0.28024 2.8319,1.65816 z m 93.2895,0.48406 -0.5494,0.35436 z m 33.1814,0.32483 c 6.646,1.90343 -4.6607,4.09437 0,0 z m -34.2493,0.91716 -0.9449,1.06038 z m -3.1825,3.79179 -0.2052,2.44422 z m -100.4102,9.8765 c 7.3444,-1.97629 -1.1468,4.16164 0,0 z m 0.8343,0.88743 0.051,-0.10615 z m 608.4616,5.09111 c -11.7776,2.37491 6.6949,8.54627 0,0 z m -653.9971,6.14203 c 7.3483,3.44785 -6.0829,3.97303 0,0 z m 12.6046,11.67897 c 9.0821,10.96179 -10.5428,4.51741 0,0 z m 2.5286,2.97653 c 2.6247,1.00846 -1.8919,1.23628 0,0 z m 359.4199,1.69845 -0.3504,0.2293 z m -358.6661,0.89169 c 6.0297,0.83029 -3.2281,4.80353 0,0 z M 34.812645,329.7012 c 16.0876,1.61697 -17.6067,0.43527 0,0 z m 182.846695,3.76844 c 5.4372,2.95399 -6.6488,3.46384 0,0 z m -2.4606,5.17179 c -0.8912,4.57627 -0.6933,3.55975 0,0 z m 1.2505,5.19514 1.3036,0.24202 z m 522.4924,3.82575 c 5.4557,2.11931 -5.2211,3.11033 0,0 z m 0.1847,7.78952 -0.2121,0.37237 z m -0.344,0.60932 -0.2311,0.26824 z m -510.3187,6.4435 c 1.0466,1.75422 -2.7938,-0.38576 0,0 z m -145.166599,3.71961 c 20.268799,2.91941 -9.4609,10.26456 0,0 z M 752.29564,390.5652 c -17.429,8.02533 14.2898,7.19735 0,0 z m -41.2681,29.08808 c 4.0756,0.41661 -1.925,1.79508 0,0 z m -516.8492,4.08691 c 14.125,15.89351 37.046,32.77427 51.2688,35.13425 -24.2336,37.48317 -28.0061,-15.04758 -53.0664,-20.30053 -3.2519,-4.69778 -1.6455,-10.89122 1.7976,-14.83372 z m 6.0465,20.08843 0.5073,-0.16773 z m 588.6172,-10.31173 c -27.4362,27.7272 5.1,24.54091 0,0 z m -64.7917,5.09324 -0.1134,0.55111 z m 47.7733,13.18847 c -6.3046,8.6584 12.5729,5.38626 0,0 z m -37.0093,10.23316 c -25.7187,11.74781 12.1415,49.97301 5.3671,11.37962 3.4552,-4.28529 0.01,-11.23691 -5.3671,-11.37962 z m 23.2943,1.5456 c -15.0502,9.67014 4.2,20.33123 0,0 z m 4.9785,1.01694 c -5.6818,14.50025 17.0247,-2.19477 0,0 z m -254.7294,12.81694 c 4.7035,1.59777 -1.4652,3.94311 0,0 z m -0.4501,0.0955 -0.397,0.78554 z m 1.0488,0.72184 0.4225,0.72821 z m -1.6262,0.37579 -0.091,0.12526 z m 242.4708,22.76985 c -10.6338,4.14659 1.6216,13.48603 0,0 z m -92.8501,2.34387 c 1.5396,1.332 -1.8857,0.10614 0,0 z m 0.4862,1.10611 c 0.9198,2.2975 -2.1191,-0.21066 0,0 z m 2.4988,5.73652 -1.0551,0.61118 z m 83.9438,2.54767 c -23.0615,35.43432 6.4838,59.50057 18.6229,88.02606 3.6672,15.7902 -23.9276,46.70555 4.3126,21.94041 10.6492,7.8833 35.1889,23.24494 28.9115,-9.59005 -1.2603,-34.5533 -29.2033,-50.07594 -40.7411,-68.46075 4.419,-11.61376 -1.6277,-24.80979 -11.1059,-31.91567 z m -277.4482,2.11458 -0.3907,0.51166 z m 67.3096,0.55837 c 6.1725,0.47317 -3.2623,4.48683 0,0 z m -154.4062,1.2526 0.091,0.087 z m 369.8398,4.6665 -0.5756,0.5929 z m -87.827,1.33753 0.083,0.2951 z m -105.6457,18.74878 -0.845,0.82374 z m 373.3832,0.55411 c -21.7754,19.69545 7.3151,43.31981 7.3821,10.39847 4.5105,-5.38747 -1.7911,-10.77412 -7.3821,-10.39847 z m -178.9743,7.10378 c 1.6712,2.75892 -2.3506,0.23655 0,0 z m -213.8095,12.96979 c -15.192,16.86473 15.099,38.29113 0,0 z m 216.2787,2.87888 c 1.3973,2.31523 -2.1223,0.37084 0,0 z m 5.6707,3.7196 c 8.1926,11.2326 2.6442,10.05797 0,0 z m -4.055,0.7176 c 4.2176,1.62304 -1.8823,6.35638 0,0 z m -517.0042,1.11673 c -10.2208,17.01375 23.1572,-2.77541 0,0 z m 202.9372,1.08913 0.078,0.69529 z m 304.2668,0.72608 c -22.3415,33.58314 -34.2521,75.5952 -73.4371,91.45568 -13.2837,10.71757 -14.7681,38.76893 1.5712,41.78578 19.9626,19.75274 58.9094,16.94565 57.5957,-19.53974 24.3605,-14.34501 -13.034,-37.75003 16.6977,-43.94697 -21.6318,-15.13589 -26.2228,-34.33025 -2.888,-54.8023 -0.4908,-3.73771 6.1008,-3.20142 0.4605,-14.95245 z m -516.9362,2.51159 c -14.1155,-2.99294 6.1079,-3.12331 2.5493,2.68211 z m 541.0458,5.09747 c 12.1478,3.78723 -8.3522,6.61523 0,0 z m -230.7558,1.85769 0.7706,1.00633 z m 40.4889,2.7621 c 3.9484,3.67786 -3.9927,1.51951 0,0 z m -44.6905,0.84923 c -12.0106,10.91017 11.9759,8.58397 0,0 z m 250.4876,2.74725 c 8.0953,-0.28543 -2.813,5.7124 0,0 z m -6.7578,4.26947 -0.067,0.27015 z m -341.8152,3.98075 c 8.9692,7.76258 -6.8341,5.4109 0,0 z m 344.8555,0.81738 c 1.5809,13.66636 -15.8024,7.49148 0,0 z m -243.3307,2.80881 c -9.807,4.87835 8.5992,7.44988 0,0 z m -96.8605,2.98078 0.028,0.004 z m 102.6417,0.7176 c -8.7905,11.11295 15.1649,42.24697 0,0 z m 308.4577,2.23133 c -27.0879,21.77619 30.5126,15.49552 0,0 z m -77.6043,11.9571 1.2418,1.65701 z m -39.7523,1.4352 c -10.3386,4.1656 9.6009,7.01562 0,0 z m -8.1653,1.50312 -0.1403,0.44142 z m 1.3652,11.89553 0.225,0.66664 z m 13.0185,7.63666 c 0.9004,1.94677 -2.9456,-0.30897 0,0 z m 57.9427,1.03818 c -13.6394,5.38497 12.4764,20.35219 0,0 z m -141.9841,3.21644 c -13.9965,12.31527 15.1508,8.35905 0,0 z m 132.6512,3.97862 c -11.5108,6.84962 13.4016,7.86552 0,0 z m -127.0696,4.41597 c -9.7013,8.10596 9.8336,8.45456 0,0 z m -26.2284,0.49468 c -4.7123,11.68859 12.0751,3.04192 0,0 z m 172.5626,0.71547 c -9.9584,16.53734 -8.4206,62.71219 9.0549,29.2091 13.5571,22.92498 26.5338,-3.27995 1.5111,-5.05615 -5.3961,-7.34633 -5.5474,-16.57142 -10.566,-24.15295 z m -245.5471,1.02756 c -8.924,12.84187 18.5277,5.50577 0,0 z m 226.3292,1.30781 c -12.3236,7.19863 10.373,6.93611 0,0 z m -54.911,1.57956 c 3.7857,5.91136 -5.2049,0.91442 0,0 z m -158.0344,5.63885 c 13.1891,0.47052 -2.9439,10.98225 0,0 z m 33.8755,1.08489 c 7.3313,0.18475 0.2936,5.23424 0,0 z m 178.9,0.46495 c -25.1587,7.2641 -57.496,3.45201 -50.1773,43.38482 -4.0596,21.83952 25.6335,59.75273 12.8169,13.88282 -3.789,-10.6404 43.1218,31.17325 20.4831,-2.70859 -5.2605,-17.47184 -10.4954,-21.05882 3.2028,-19.51094 12.645,-26.70509 -48.3704,-4.99646 -10.4008,-21.75401 11.1854,4.55736 26.4109,2.9138 24.0753,-13.2941 z m -113.6561,0.57747 0.066,0.0679 z m 1.4076,0.0701 c 3.5749,0.0397 -1.976,2.321 0,0 z m -1.1825,0.33969 0.061,0.0807 z m 5.9488,0.29085 0.059,0.017 z m -66.2503,1.69633 c 5.5908,1.18033 -0.835,5.2099 0,0 z m 47.9177,2.0806 c 2.5707,3.64563 1.7209,2.44051 0,0 z m 2.2928,0.34606 0.4289,0.16773 z m -38.835,8.14196 c 1.8715,13.17289 -6.2974,12.14887 0,0 z m 207.3723,8.37972 c -0.5572,3.77646 -2.5261,-1.03882 0,0 z m 27.655,1.1316 c -18.5057,19.47414 16.1544,9.44585 2.0441,2.13387 z m -37.6185,1.05941 c -13.7933,4.86629 6.7791,9.16123 0,0 z m -36.1027,3.6262 c -21.1438,2.14368 19.9364,28.04652 14.8679,22.64712 18.5383,0.3691 49.259,8.66015 19.274,-11.22595 -13.5818,0.74944 -27.9893,7.74447 -23.87,-9.96609 -2.6701,-0.568 -11.0364,4.8317 -10.2719,-1.45508 z m 38.3956,1.91712 c -21.1376,3.83099 15.1436,11.67196 0,0 z m -72.664,12.32014 c 1.8975,8.32726 -5.9905,-0.72098 0,0 z m 93.8224,5.80658 c -3.1236,13.22061 14.0505,7.6376 0,0 z m 7.6983,0.58596 c -7.54,7.66093 11.8625,6.35324 0,0 z m -4.9489,11.26497 c -19.1451,5.83492 -3.4778,24.0167 0,0 z m -239.3074,1.44369 c -12.0779,5.1564 11.634,6.9469 0,0 z m 80.1668,3.30986 c -11.8354,4.7536 8.1967,8.19152 0,0 z m 167.6542,5.36285 c -13.8107,11.90702 9.5812,11.04293 0,0 z m 27.7802,2.99565 c -4.8814,8.74718 14.9413,5.58037 0,0 z m -74.9463,2.92345 c -10.9011,6.4681 8.6319,7.64492 0,0 z m 22.1627,0.74096 c -28.2883,27.0258 18.5343,8.70002 0,0 z m -14.9103,6.16537 c -10.2716,7.16084 11.8878,6.1716 0,0 z m -13.7469,2.54768 c -9.9124,12.95576 26.3665,-0.7018 0,0 z m -69.7723,10.40514 c 9.9428,-3.29898 0.9928,4.75515 0,0 z m 5.5348,0.36729 0.1256,0.17811 z m 41.8647,2.2653 c 4.0686,3.26158 -7.9129,1.3203 0,0 z m -24.8695,7.19718 c -29.1898,6.74625 13.9189,8.25731 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.30000001" /> diff --git a/artwork/continent_central_america.svg b/artwork/continent_central_america.svg index b5aff8206..3a86302f5 100644 --- a/artwork/continent_central_america.svg +++ b/artwork/continent_central_america.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="125.41689" + width="136.36523" + version="1.1"> + d="m 43.66855,5 c -4.11238,3.1223071 -6.58332,8.653099 -12.84199,6.7233 -4.36086,0.514771 -12.659913,-2.5142899 -11.794375,4.784318 -8.629892,2.205896 4.826555,6.03852 3.389251,11.571749 -3.129266,4.298441 -11.976457,-1.959102 -14.2030544,4.922678 -0.589496,5.184069 -6.5800048,11.653977 -0.548993,15.698252 4.9077874,4.47051 12.9003254,1.39124 17.4976514,6.69832 4.90021,1.573794 9.31779,3.127964 14.21013,3.862034 4.27895,0.37409 2.43637,-6.833655 4.02003,-2.32579 2.80566,-1.263268 4.08763,6.95841 0.57654,4.34092 0.37348,5.20784 7.16626,8.19593 9.218,13.16629 6.07458,3.9016 5.26091,10.47874 3.76088,16.37083 0.87014,3.48295 10.26187,6.067239 6.39886,1.03857 -4.08677,-5.45022 4.72231,1.23801 4.34116,4.001769 3.18064,2.08949 10.79608,4.82996 6.91532,10.06452 1.19877,3.80943 5.48771,1.22961 1.99143,-1.07215 4.25216,-0.80108 3.147,10.569 6.88142,4.14155 6.2011,-2.11879 8.2284,5.62721 12.582652,6.36265 2.11289,-7.26029 1.37306,9.62867 6.573198,3.83151 7.42456,-1.21349 0.13328,-6.14243 0.86654,-9.41118 5.9849,-0.77199 6.10862,-10.84022 12.66647,-7.24308 3.10601,1.42703 6.04401,7.57324 7.63817,3.84928 0.092,2.99739 4.89946,4.80086 0.22734,2.89519 -6.99103,0.74476 1.56754,16.06798 2.61478,7.19627 0.62965,-2.04508 2.38798,1.86253 3.63592,-1.61125 3.29716,-5.65786 -1.66072,-11.29416 -5.47179,-15.07655 -4.12387,-3.03916 -8.24008,-2.51537 -12.12629,-3.93264 -5.82043,2.0163 -11.0563,8.8795 -17.95603,7.70375 -2.37003,-1.75199 -3.10927,-3.39518 -4.54417,-1.19285 -4.45951,-2.04402 -4.72454,-8.410609 -9.38923,-10.755419 -3.22656,-5.62689 -7.71904,-12.01621 -3.91548,-18.43212 -0.3149,-2.92441 0.94154,-3.28342 0.4914,-7.28378 1.38748,-4.08558 1.47912,-2.05124 1.18602,1.1485 1.8651,-5.74985 0.0795,-13.593175 4.89658,-18.686683 -1.10043,-3.064147 -0.0483,-7.175129 0.72272,-8.267633 -0.79624,-0.634651 -4.06466,-4.683787 -2.40193,-1.274812 -1.51769,-2.328199 -4.27097,-1.696275 -3.97181,-1.17641 -4.16163,-3.862347 3.40301,-0.919056 1.71771,-1.764048 -3.6625,-6.196814 -11.22797,-3.871002 -16.88689,-5.30675 -5.65391,3.830697 -12.67899,1.044673 -19.14354,1.942918 -2.5358,0.342897 -8.82391,5.466136 -3.46777,1.551589 1.50908,-2.152544 -2.48815,-3.683677 -2.19419,-1.2679 -2.79142,-1.84754 -6.12623,-0.537063 -1.7086,-2.796621 6.62405,-4.329968 6.33444,-11.88343 8.04633,-18.725542 C 46.52977,8.7554391 43.80766,6.1777961 43.66855,5 Z m 3.21431,9.804309 c -1.71625,1.449838 0.31255,1.648089 0,0 z M 34.65614,19.9676 c -0.2752,2.344792 -1.9417,10.954986 -1.66885,9.011824 0.53285,-3.008281 1.22907,-5.98706 1.66885,-9.011824 z m 24.39825,6.033747 c -3.08963,0.472271 -3.37006,2.110201 -0.20896,0.08433 z m 21.79962,15.538705 -0.44409,0.280046 z M 30.14038,45.70338 c 0.008,1.984098 -2.17435,0.497978 0,0 z m -3.23979,3.233427 -0.17803,0.198883 z m 7.39463,0.278121 c 2.99901,2.743311 2.8788,3.2416 0,0 z m 23.48321,1.520113 c -1.43288,1.385719 -1.55976,0.76467 0,0 z m -17.73608,0.405505 c 2.71772,0.811957 -3.02261,-0.312298 0,0 z m -17.016355,0.371537 c -0.487561,0.652089 -0.852255,1.139849 0,0 z m 18.903765,0.337567 0.0862,0.01455 z m 0.45221,0.04458 1.05677,0.757285 z m -19.901602,0.371536 c -0.123423,0.610961 -0.07774,0.384828 0,0 z m 38.151462,0.195321 c 0.37524,-0.130403 0.0677,0.482631 0,0 z M 22.393323,52.8857 c 0.07694,0.645783 0.05743,0.482036 0,0 z m 33.160137,0.03397 c -0.63247,0.907584 -2.6325,-0.09161 0,0 z m -3.76844,4.573081 c -0.58805,1.10537 -2.47317,0.76876 0,0 z m -2.09759,2.2271 -0.29589,0.8923 z m -0.35455,0.89381 -0.0446,0.0361 z m 9.00179,9.61323 c 3.83294,0.78647 10.81923,8.14231 6.30356,10.28608 -5.62946,0.45288 -8.82215,-5.66521 -6.30356,-10.28608 z m 1.777,9.34573 0.32192,0.11648 7.9e-4,2.9e-4 -0.32192,-0.11649 z m -0.86408,0.17409 -0.12102,0.21443 z m 4.92763,1.57531 c 0.63896,0.22415 0.53066,0.18616 0,0 z m 6.64519,0.75369 c 1.06848,1.38502 1.15534,1.66369 0,0 z m 11.54522,14.203299 0.0319,0.24806 z m 34.84161,11.10787 c -2.27097,1.14491 1.05656,2.66976 0,0 z m -31.06256,1.95109 c -1.1704,0.74237 1.09237,0.41329 0,0 z m 5.24185,6.38194 c -3.58576,2.74519 2.5543,4.00838 0,0 z m 5.929722,0.67938 c -0.98804,0.0895 -2.399002,1.69938 -0.66687,0.54258 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.30000001" /> diff --git a/artwork/continent_europe.svg b/artwork/continent_europe.svg index 921186a9f..c0abaa459 100644 --- a/artwork/continent_europe.svg +++ b/artwork/continent_europe.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="337.66916" + width="423.79449" + version="1.1"> + d="m 300.98661,10.089219 c -14.3809,-0.7779103 -25.8503,3.7006 -36.9866,6.84561 -13.5922,5.37088 -31.3206,6.40792 -38.7908,18.31395 3.6447,5.09662 12.4907,-0.67381 2.1442,6.91244 -8.7231,14.081134 -20.1548,23.088554 -36.1461,28.164204 -20.8601,4.92333 -18.7646,33.856267 -2.2688,42.616037 7.2092,5.02078 35.5472,-15.269277 22.0773,0.21892 -18.9744,2.01163 -13.2974,25.80279 -13.7369,33.36367 -21.0359,-9.39784 -25.764,24.26283 -42.2911,19.09018 8.7222,-11.49844 -7.0571,-15.16675 -7.5441,-23.89634 -13.7296,-5.3116 -14.067,-18.23102 -10.9475,-28.78077 -21.0859,3.31595 17.12,-18.655827 -6.1485,-12.52891 -6.6843,7.18684 -18.135,6.99276 -19.4378,9.14441 -5.3306,-7.6747 -20.392704,8.43551 -6.7335,13.52491 -5.563204,6.26502 -2.9233,5.35938 0.014,7.10417 -5.403904,5.42199 -18.067704,0.17456 -18.152004,10.36051 -8.2222,-5.1859 -14.3455,9.37989 -5.1839,13.9757 -13.7937,7.53459 -2.1789,19.96813 9.6802,10.98559 10.599904,-1.52754 19.018804,-6.91968 18.297904,-18.40091 6.5546,3.39547 1.6816,9.9503 5.7097,11.41443 -11.6866,2.34492 -4.5086,6.80467 0.373,9.9081 -6.4749,1.75844 -15.214104,13.22998 -2.5072,10.74073 8.8679,-2.67502 -3.6275,12.92291 -4.4321,16.49378 14.6158,4.76388 29.5006,17.07513 21.4634,34.92385 -17.0361,6.65579 -38.967704,-9.77594 -53.039404,5.75382 0.7112,13.72422 0.8207,26.6872 -5.8776,38.61362 5.9344,5.62787 -2.3324,19.50578 11.8302,15.37422 10.4397,-5.72539 10.341,24.17827 23.661104,11.13682 5.6532,-14.23966 29.512,-6.02555 33.8436,-24.67195 -4.2462,-20.6653 24.1516,-20.05782 26.0719,-37.30125 5.6986,-8.72797 32.714,8.03186 36.3564,-11.87863 9.8524,0.72305 11.291,11.97013 0.3604,9.5555 -7.4231,4.75237 1.2232,19.07527 -6.9751,16.20259 -2.1933,9.86352 5.1424,30.78566 14.6533,14.49047 3.0827,-7.76757 -7.7424,-31.16201 5.5006,-24.72225 -4.7939,5.39272 8.1738,-0.70804 7.5587,10.2364 4.5719,5.83039 18.0209,-3.34608 13.4572,9.8029 17.1594,-10.78306 16.2952,26.09544 -2.1529,13.34805 -16.5117,1.69298 -0.025,12.66573 4.2706,15.94942 -14.1487,16.49645 18.034,20.85886 11.2281,2.22913 -6.9539,-14.28203 20.715,-17.4487 9.168,-32.60807 11.0705,8.63615 17.1475,-3.48062 4.4957,-8.26561 -15.2497,-7.93286 -29.2397,-18.69238 -33.6344,-35.16571 10.6287,4.49713 18.2518,20.08876 28.7791,22.52024 13.0616,0.73125 16.3603,10.90985 14.6342,21.7153 11.5648,8.47466 13.5744,35.07333 32.2676,32.49564 -5.8853,-9.83253 17.7166,-13.6509 5.2698,-6.36115 3.4936,14.34935 22.5269,-5.78969 21.9005,6.4765 -8.0558,20.31999 20.616,-6.11188 4.0928,-2.22196 -6.1514,7.1543 6.8121,-10.1745 -5.4367,-7.44992 9.2071,-13.42331 -22.7799,3.53164 -16.7797,-14.73653 -6.6519,1.72177 -18.9698,-11.34192 -6.2707,-6.82763 16.337,7.8541 18.0858,-17.71416 28.3549,-20.11735 0.9139,-12.29826 9.8469,-34.16867 22.5627,-33.32904 10.5702,3.38687 22.2444,7.93316 28.5337,-1.06754 15.6595,-1.27473 39.627,-27.17274 15.2459,-33.13093 -18.6182,1.79721 -38.8884,-22.24557 -48.4974,-21.71148 12.7302,-10.26441 -11.8443,-13.40119 -12.3633,-24.70411 -12.563,-3.40047 -26.9336,-14.07103 -18.533,-29.16984 -5.1562,-3.881507 -30.5026,-3.148857 -11.1196,-6.054607 14.8216,-1.93614 35.2582,-18.76739 18.6311,-32.2325 -5.1596,-11.999284 -9.0256,-26.389764 -11.9082,-35.440864 23.7846,-10.10419 -9.7834,-17.20282 -18.5927,-17.22596 z m -73.8252,28.18154 -0.8641,0.52016 z m -114.724,-28.07752 c -12.0161,1.84166 -8.2923,12.39442 1.1777,4.65633 1.9348,-1.21605 1.5323,-5.1063603 -1.1777,-4.65633 z m 148.969,14.18419 c 1.0588,2.97063 -1.8787,1.54073 0,0 z m -0.3375,0.0106 -0.07,0.20169 z m 3.8555,0.81313 0.083,0.0871 z m -22.9185,17.23503 -0.079,0.25265 z m -181.918904,1.71119 c -15.9302,10.440514 -34.669004,-5.11386 -47.912104,6.67008 -8.5908998,10.580424 11.3799,9.714564 6.3103,16.458034 18.6186,8.79986 38.554304,0.35022 56.303204,-5.89996 9.7752,-3.92521 -8.8276,-16.157924 -5.6171,-15.969824 -3.0476,-0.0997 -6.2437,0.12287 -9.0843,-1.25833 z m 231.798104,9.307514 c 8.9666,8.89912 -32.4051,24.02872 -10.8037,7.32825 -0.3243,-7.90331 5.4403,-6.2197 10.8037,-7.32825 z m -269.503808,4.9807 c 0.6296,1.74479 0.3738,1.03609 0,0 z m 188.908108,8.73854 0.1292,0.33754 z m 59.6135,2.69628 c 5.6568,4.81363 13.5759,34.068007 -1.3829,21.31147 -7.1793,8.10933 10.3986,6.55884 13.6686,6.48233 11.9888,1.83308 10.0078,4.953127 -0.982,5.124097 -7.3239,2.70427 3.9068,1.69091 -0.9029,6.44838 0.7671,9.81534 -7.6018,16.38177 -0.3718,28.17564 -7.6573,6.76694 -23.1864,-6.88815 -33.6019,3.68395 -9.7869,5.98201 -14.113,-8.19567 -20.2625,-2.82943 6.2294,-8.13939 22.7353,6.28578 13.6376,-8.01857 13.2886,1.53732 17.3498,-11.76264 16.0711,-19.68275 14.0319,-5.52849 11.8371,-18.787657 0.038,-22.993007 0.8182,-8.95277 5.2988,-14.58743 14.0888,-17.70211 z m -62.5731,1.54559 c 7.531,1.4456 -5.5934,4.26723 0,0 z m -100.51,1.99781 c -23.759704,10.67991 21.1767,24.78957 5.4371,1.50603 l -2.557,-1.24381 z m 79.2985,9.87224 c 6.0634,1.44715 -6.6304,1.35377 0,0 z m 0.3567,0.77705 -0.051,0.12737 z m -42.6439,4.27797 c -13.7961,-2.63535 -6.3972,19.579037 2.1892,5.871 3.1351,-1.98963 1.4865,-6.1297 -2.1892,-5.871 z m 49.7837,0.26114 c 1.255,-0.14408 -0.089,1.4229 0,0 z m 107.4165,8.32665 c -3.747,5.674077 -8.9824,-1.19219 0,0 z m -34.3406,13.604587 c -13.8941,0.0194 -6.3654,21.28428 1.339,6.56185 1.0999,-1.43336 2.8862,-7.0109 -1.339,-6.56185 z m 26.1646,0.62419 c 15.3608,10.29777 -13.5079,4.24823 0,0 z m -186.0738,0.3779 c 1.8921,1.4059 -0.9824,1.07244 0,0 z m 109.6818,2.191 c 9.3028,3.28873 5.735,19.77917 -0.2357,11.92879 -6.7092,-4.93676 8.6232,-10.91764 -1.938,-9.70535 z m -5.4711,11.05054 1.3844,0.68355 z m -11.6239,3.27802 0.053,0.0255 z m 18.4197,2.73026 0.4119,0.13588 z m -1.3884,1.06365 c 0.9816,0.13112 -1.4102,0.17556 0,0 z m 3.9213,2.33962 -0.6455,0.12951 z m -102.4867,1.34814 c 1.6235,0.90651 -1.5584,1.49687 0,0 z m -8.0358,0.54988 0.7961,0.61993 z m 175.2037,0.8386 c 20.1403,1.52213 -7.6643,8.14127 0,0 z m -15.3476,5.07412 c 3.3115,0.795 -1.6915,2.57253 0,0 z m 2.8895,0.75369 c 0.9835,3.93664 -5.4433,0.87506 0,0 z m -47.6586,1.05729 c -2.6815,2.09449 -6.063,-1.07172 0,0 z m 15.2097,1.23563 c 5.9197,5.38605 -4.9411,-0.52575 0,0 z M 123.88281,145.15 c 2.7237,5.27572 -6.1081,3.51815 0,0 z m 92.7822,0.52228 c -2.0027,4.78604 -7.3675,0.63865 0,0 z m -1.9872,0.58808 0.1953,0.0488 z m -87.1666,2.21012 -0.024,0.87374 z m 65.592,0.61781 c 3.6263,2.08028 -1.3323,1.1896 0,0 z m -108.104304,4.05717 c 0.6201,1.43868 -2.8644,-0.60589 0,0 z m 12.681,6.35858 0.1589,0.0824 z m -11.3646,4.16333 c 6.7565,4.28636 -7.431,1.58913 0,0 z m 66.823404,7.29484 c -0.7162,18.96563 -42.0524,2.69739 -14.759,3.39763 4.9786,-0.66297 10.3056,-0.79257 14.759,-3.39763 z m 73.4219,12.97829 c 0.9801,1.24888 -1.2353,0.74058 0,0 z m -106.2721,12.02928 c 3.2883,0.53981 0.035,1.59022 0,0 z m 8.9423,5.63673 c 1.1525,1.00859 -0.8289,0.55557 0,0 z m 221.1574,0.40763 c 1.0747,0.88643 -1.2708,0.25332 0,0 z m 25.6913,6.96153 0.074,0.18585 z m 1.2505,0.99147 c 1.8699,0.28289 1.2373,0.18718 0,0 z m -244.4963,19.11819 c 4.6079,3.73722 -4.658,2.98573 0,0 z m -52.887604,19.6447 c 2.912,2.76866 -2.3259,1.08367 0,0 z m 237.500704,8.23961 c 4.7076,8.42555 -9.8927,3.64886 0,0 z m -149.4679,3.59011 c -13.5397,-4.39879 -13.4429,17.55934 -3.1562,7.14643 4.1232,-3.46169 13.3611,-1.22258 3.1562,-7.14643 z m -90.262104,1.81946 c 3.6525,4.61695 -4.7412,2.02526 0,0 z m 86.081704,2.42242 -0.459,0.46449 z m 160.3806,2.11457 c -6.4488,4.65997 -1.2189,20.54844 4.1753,7.01577 10.6847,8.55453 -0.015,-8.33095 -4.1753,-7.01577 z m -250.328304,1.49463 c 5.0092,4.93176 -3.0253,3.39491 0,0 z m 76.177504,0.43948 c -13.3808,12.23573 12.2232,8.67488 0,0 z m 145.7887,3.0381 c 6.2007,0.0294 -3.5653,3.42863 0,0 z m -164.9642,3.11666 c 6.4066,4.20325 -3.9441,3.62298 0,0 z m 197.2794,9.67055 c 4.9297,0.20771 -2.6234,1.74389 0,0 z m -11.3626,1.08914 c 3.5845,-0.47394 -2.2659,3.75108 0,0 z m 9.0845,0.552 c 6.0247,4.37649 -7.505,-0.10429 0,0 z m -103.2743,1.7855 c -5.5225,11.13499 13.474,2.44629 0,0 z m -127.918804,0.91291 c 1.2606,4.46269 -5.0857,0.0915 0,0 z m 213.236304,6.17811 c -14.5268,17.31387 36.1052,15.19582 13.4329,5.88034 -4.7719,-0.65621 -11.0157,-0.85569 -13.4329,-5.88034 z m 74.1841,0.87258 c -12.0115,-1.1942 -25.1337,16.99434 -8.5929,19.20884 9.0389,-3.65059 30.0036,-19.96739 8.5929,-19.20884 z M 12.850902,322.84619 c -7.4299998,9.99754 12.9574,1.60885 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.30000001" /> diff --git a/artwork/continent_north_america.svg b/artwork/continent_north_america.svg index d43cd7509..05e7cdec3 100644 --- a/artwork/continent_north_america.svg +++ b/artwork/continent_north_america.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="565.99963" + width="845.65448" + version="1.1"> + d="m 787.79189,10 c -42.64608,0.733827 -85.41095,5.471991 -127.38615,12.173527 -18.9721,4.696335 6.74516,29.850179 -13.85456,23.389495 24.56414,-12.76128 -70.56963,-21.861339 -40.00292,-1.503114 20.82832,-2.142919 34.59945,1.37039 5.00448,3.314875 -19.1723,4.038666 -24.64588,-12.410088 -36.82999,6.199346 -17.5871,-8.667113 -31.3596,3.42168 -45.44053,-10.698056 -15.72175,-1.993292 -68.66078,13.855436 -28.1909,15.851986 28.45651,17.12787 63.02717,-3.83941 93.25912,1.93137 -2.79945,5.12586 -55.61141,16.90902 -19.19936,27.25902 18.9231,6.33901 -49.28495,21.730491 -26.19977,-9.72939 24.83583,-21.57784 -25.5166,1.59805 -37.07818,-6.07721 -23.33448,-17.17168 -69.84117,-10.63412 -78.77104,13.87794 9.0444,6.05843 45.07204,-8.77486 20.96811,12.53053 -33.29472,-3.24116 -64.46603,-9.88399 -97.9147,-1.11749 -20.77711,0.724 -58.50746,-5.03705 -88.60236,-12.11707 -33.04874,0.91747 -65.16368,11.07952 -96.23048,20.931241 12.57973,30.88109 -38.21693,-0.0851 -40.20085,28.13203 14.59215,6.69131 29.49973,5.13477 5.38504,8.71269 -20.42472,5.1711 -47.286295,19.21163 -57.617215,30.05554 10.00181,1.59621 34.398495,-2.91378 14.35542,10.81749 15.455075,-0.0484 33.669695,1.13324 8.822025,9.00307 -29.987125,12.31949 -62.508899,18.02019 -92.0683057,30.80164 12.9418807,4.86622 58.2471407,-11.53665 80.3221107,-17.31996 10.153775,-2.93932 49.250515,-21.07792 24.326075,-1.18892 34.0629,-9.20937 61.57385,-36.52957 99.12843,-32.55271 40.2417,-8.67306 35.62413,39.0055 19.05647,57.50002 8.25295,18.97929 18.56277,-30.19711 19.45921,1.10297 -1.69247,13.49382 -11.97968,25.7747 1.12504,39.31282 -10.70526,30.46944 -46.95651,52.1556 -40.77068,88.54521 -1.64554,17.32735 12.98463,48.71155 19.73992,40.94862 -2.09069,17.26409 14.3052,39.97351 2.89269,42.76169 14.22054,10.54898 15.74946,50.69384 34.40264,37.47725 -5.5187,-15.30893 -22.58512,-64.62961 -0.97283,-28.48285 26.16019,21.55575 14.28342,63.21889 43.66826,80.44373 23.13597,12.97299 58.57048,19.37026 76.80836,22.74712 15.0369,-12.5911 8.03362,-28.08292 34.37047,-26.05776 16.96574,-14.4341 13.00903,-46.75818 -15.52231,-29.50182 -9.11773,45.15115 -68.90133,16.71122 -48.73,-19.95052 0.79068,-36.92167 36.24989,-62.14436 69.90866,-43.53417 4.38006,-23.58985 57.62938,-11.00415 44.27734,17.56022 11.79806,34.37888 29.8136,-5.30246 17.31058,-22.82392 3.52279,-40.17927 62.20649,-36.06743 65.642,-77.96803 12.69057,-24.73648 48.49939,-15.55793 50.53988,-44.40424 10.37342,-4.53345 32.55024,-13.26091 30.64863,7.31179 3.75738,-21.50998 68.11474,-18.70412 43.91028,-36.80619 -27.4979,10.09011 -15.95461,-11.55774 -22.51937,-22.84251 -23.28785,3.57302 13.3209,-8.67044 15.78493,6.78662 10.77065,-5.93932 -1.56589,-11.80588 17.52379,-9.49115 14.19626,-6.14609 31.38182,-12.5887 11.24698,4.4318 -25.76181,12.53809 6.67759,37.1157 21.53862,22.0392 17.12985,11.28087 20.61153,-26.29679 3.18564,-29.87054 14.47302,-22.39 3.77926,-38.91626 -13.94416,-49.00917 6.16362,-19.6751 -8.70888,-48.95409 -27.39542,-20.75512 -22.40717,3.76331 2.52968,-24.15671 -19.20847,-27.20606 -14.39089,-5.22989 -36.47992,0.24397 -12.59744,-13.11045 20.95608,0.0205 22.23535,20.50911 49.77564,19.99752 11.34522,1.98039 -5.98689,-14.1922 14.05281,-6.47946 4.45235,-6.65477 10.66877,-9.03293 6.02623,-20.91646 18.52694,7.05835 43.94923,-19.98852 13.33139,-24.32323 -8.62709,-0.43642 5.62212,-21.982351 -15.82923,-23.778091 -21.84087,-20.48673 -50.44228,-16.79252 -79.30254,-17.10632 40.90155,6.42464 73.58651,-17.612033 110.00557,-30.252329 26.4684,-9.532774 56.77619,-11.572764 82.43829,-21.641592 C 821.76974,8.417165 803.2891,11.111296 787.79189,10 Z m -4.53486,1.953219 0.41612,0.137999 z m 0.78766,0.02548 c 2.08232,0.05449 -1.10052,1.442021 0,0 z m -15.11197,0.286614 0.10827,0.273875 z m 4.67498,0.286614 c 5.58721,0.803418 -4.05004,2.411933 0,0 z m -14.9039,6.855374 c 4.15201,3.909105 -7.43577,0.712436 0,0 z m -73.09709,1.021193 c 10.57863,2.2379 3.25862,6.820077 0,0 z m 56.24209,0.575351 c 3.59014,-0.309073 -1.54323,2.853815 0,0 z m 70.59186,0 c 1.37531,0.981037 -1.77544,0.0471 0,0 z m -173.01907,4.836334 c -23.51388,6.044051 17.20089,7.941705 0,0 z m -65.46467,8.551702 c -21.18404,-7.073471 -29.78521,23.327508 -4.26948,9.178005 5.88608,-0.03384 17.55433,-8.575748 4.26948,-9.178005 z m 23.71037,2.965921 0.0403,0.02123 z m 28.99044,2.199493 -0.21892,0.279027 z m 69.31167,1.250485 -0.0403,0.760056 z m -26.02452,0.564735 c 9.82823,7.447416 -12.63805,0.64391 0,0 z m 43.95166,0.972363 c 2.00266,1.701383 -3.18038,0.393457 0,0 z m -30.65492,2.912844 c 2.21337,0.633849 -2.19547,0.867436 0,0 z m -14.20542,1.184669 c 3.74903,-0.292097 -2.20929,1.945256 0,0 z m -41.91777,0.288737 -0.1293,1.012423 z m -7.40099,2.137925 c 14.61515,3.549456 -9.04517,12.762126 0,0 z m -12.72989,2.290786 c 7.24899,-0.02153 -3.80247,4.73729 0,0 z m 82.03306,1.91713 -0.62755,0.0738 z m -29.46813,0.002 c 18.77626,-3.348962 21.7212,6.4555 0,0 z m 1.48402,0.40975 0.0149,0.21443 z m -24.07766,0.65603 c -9.40296,5.44373 7.25108,18.08825 -12.04839,10.5771 7.46132,-0.0953 2.95269,-14.771513 12.04839,-10.5771 z m -87.29189,0.0955 c 3.50396,2.31296 -4.67681,0.21153 0,0 z m 152.08567,0.49042 -1.04918,0.22357 z m -153.38923,1.63901 c 3.35531,-0.3373 0.97833,3.06615 0,0 z m -5.44566,0.61993 -0.58499,0.18066 z m 45.0132,0.21868 c -1.16772,2.58654 -4.38355,-2.19458 0,0 z m 19.98864,4.85969 c 2.05835,13.90203 -17.26521,7.0064 0,0 z m 8.3033,2.22922 0.5172,0.30834 z m 21.37076,5.96156 c -19.92512,3.22289 -23.49978,24.4176 -9.4815,31.387781 -27.07281,14.18193 -30.31259,-34.495611 0.76393,-27.240351 l 4.85405,-1.69113 z m -66.71303,4.16758 0.25265,0.051 z m 26.65719,1.26959 c -1.60432,5.72419 -8.78499,7.3555 0,0 z m 51.96623,1.02119 -0.55145,0.95904 z m -116.501,1.79399 c 4.60621,2.25277 -5.34293,2.43037 0,0 z m -22.24333,0.67514 0.63055,1.4182 z m 46.85176,9.62172 c -14.01623,8.57364 20.78883,5.71938 0,0 z m -273.6077,1.08276 -0.26751,0.21019 z m -57.64967,2.1719 c 7.16023,2.14071 -7.25478,3.7883 0,0 z m 7.60056,0.82799 c 1.46874,1.37165 -1.71931,0.6888 0,0 z m 164.03639,0.0786 -0.20129,0.52788 z m 142.78666,0.68999 c 4.62119,1.52007 -4.28372,3.10146 0,0 z m -154.43378,0.45646 c 4.9834,1.235 -3.74991,3.3348 0,0 z m 293.74921,0.76218 0.0348,0.87818 z m -296.51344,0.0807 c 2.80765,4.14706 -6.37786,0.71904 0,0 z m -174.87039,0.81738 c 6.15482,2.70146 -6.55363,3.36322 0,0 z m 471.55155,0.21018 0.0191,0.23778 z m -25.14556,2.55192 c 7.93302,8.289011 5.03098,16.043881 18.9321,3.360401 -22.42608,32.05817 11.5417,7.00199 13.04386,14.88985 -23.71989,13.70359 -48.67377,14.39809 -60.11724,43.62962 -10.5818,9.7739 -4.76057,9.42919 -14.4159,23.28084 12.54761,24.70155 -51.3641,34.14409 -32.32516,47.0335 -25.1694,29.01863 -7.9762,-18.40901 -6.40442,-22.78098 -25.92282,4.52439 -78.93685,-30.07884 -34.66379,-47.55956 9.91131,-7.01052 63.08175,-26.46011 51.50657,-20.34559 -14.98883,9.92341 33.90804,22.21358 19.75747,7.06207 -18.10842,-3.45379 39.36018,1.47773 12.4129,-15.29346 2.91525,-13.71398 29.8552,-14.49544 32.27361,-33.276691 z m -22.55543,0.78554 0.49042,1.326911 z m -53.31437,0.798271 c 3.10648,1.13688 -4.26232,1.89452 0,0 z m -175.42239,0.48193 c 5.66514,2.01448 -6.24584,2.57579 0,0 z m 175.6538,0.3312 -0.0446,0.008 z m 8.97843,0.42249 c 7.08475,1.4092 -5.18438,2.30176 0,0 z m 98.01761,0.22292 -0.19107,0.0722 z m -74.42188,0.41825 c 1.9041,-0.80241 -0.056,1.62423 0,0 z m 76.59377,0.14012 0.18762,1.68573 z m -112.07441,0.0446 -1.13612,0.65906 z m -106.67757,0.91504 c -0.53703,6.43288 -7.52355,-4.262431 0,0 z m 72.64274,0.0807 c 20.1684,13.01577 -46.48578,0.80111 -4.86445,3.75234 l 2.69123,-1.16247 z m 33.08582,2.29503 c -2.05464,4.65025 -11.66138,-0.43695 0,0 z m 156.77764,0.84711 0.11348,0.0842 z m -158.83913,0.69849 -0.0191,0.006 z m -105.36341,0.34393 c 22.36168,1.18333 -16.20402,7.67358 0,0 z m 145.17085,1.83858 c -0.0582,8.69438 -10.25076,0.89517 0,0 z m -46.14479,2.42666 c 1.42854,1.47338 -2.81493,0.26811 0,0 z m -60.38629,1.09125 0.12526,0.0616 z m 107.95566,3.01051 c 6.73995,0.22395 -3.26372,4.06811 0,0 z m -191.14579,0.16134 0.2951,1.10188 z m 204.79922,1.04455 c 5.80714,4.16266 -4.67236,4.09564 0,0 z m -452.28688,3.15063 -0.12526,0.97024 z m 521.60277,0.81526 c 2.65318,1.16515 -0.56182,3.68168 0,0 z m -288.09124,0.91504 c 12.70713,5.1218 -9.2551,4.7339 0,0 z m -281.81971,0.21231 c -14.20023,3.038 7.64488,7.22831 0,0 z m 483.8547,1.30143 0.12219,0.3589 z m -469.10579,0.77492 c 4.76868,3.30492 -7.19067,1.77715 0,0 z m 276.36133,0.53714 c -0.84573,3.26021 -5.16058,-3.62367 0,0 z m 300.20756,0.50529 c 10.87678,6.74167 -6.67941,7.10762 0,0 z m -550.78215,0.81313 c 4.18992,-1.93703 -1.15946,3.76072 0,0 z m 246.87833,0.42886 c 2.18158,0.42605 -1.8388,1.40185 0,0 z m 324.51878,0.70698 0.0106,0.0934 z m -596.95456,0.26326 c 5.05072,3.02528 -6.98988,2.23132 0,0 z m 252.31339,2.76847 c -0.65791,1.84796 -4.23956,-0.8412 0,0 z m 290.94252,11.27347 0.0403,0.14861 z m -587.107785,1.15071 c -21.84636,7.84838 1.610465,14.19992 5.570185,1.88354 z m -0.2484,2.22072 0.0191,0.13375 z m 610.469975,1.45217 0.13588,0.39065 z m -84.20919,4.2334 c -22.50352,6.72623 11.74111,13.65616 0.0734,0.0162 z m -177.80022,1.4734 -0.0352,0.42666 z m -1.08064,0.78341 c 1.58607,1.22939 -2.25377,0.59812 0,0 z m -0.97024,1.22926 c 1.49499,1.12599 -2.41249,0.34805 0,0 z m -30.93092,0.24839 c 20.3639,5.21773 -24.75324,14.61444 0,0 z m 21.2264,0.71335 c -3.14936,1.8739 -2.11102,1.25608 0,0 z m -8.51561,1.05941 c 2.11415,-0.20986 -1.94232,1.04118 0,0 z m 0.53501,1.52012 c 2.23198,-0.45952 -1.0215,2.14822 0,0 z m -2.45426,0.12313 c 3.40692,0.95568 -4.4047,1.7365 0,0 z m -221.37609,3.75358 c 1.26015,1.0296 -2.01417,0.57873 0,0 z m -99.83071,1.88528 0.10616,0.006 z m 582.01031,1.83014 c -24.5042,10.02438 11.89712,8.57418 0,0 z m -586.763855,0.17409 c 2.826935,2.17198 1.609515,1.23661 0,0 z M 611.52028,170.096 c -16.09097,4.02474 2.02898,12.16716 0,0 z m -444.0239,3.60709 c -7.52201,7.33643 -20.99196,6.87946 0,0 z m -14.5536,5.37134 c 1.6197,-0.30185 -1.0332,2.25109 0,0 z m -3.79816,2.82368 c 1.16854,1.21835 -2.45154,0.33827 0,0 z m -29.28554,2.71115 c 5.81146,0.18269 -2.84315,7.15009 0,0 z m 481.96729,0.27601 c -19.76534,8.54715 -5.85961,37.15376 -1.29615,8.38013 l 1.19071,-2.48546 z m -351.64091,3.87033 -0.0658,0.53502 z M 83.144935,200.37726 c 1.87612,2.4825 -3.82478,1.33333 0,0 z m 2.21011,0.24627 c 1.70766,1.53943 -2.98091,0.25392 0,0 z m 31.669745,1.11249 c -13.77546,-0.43805 -10.14912,15.25829 0,0 z m -33.599615,0.36092 c 4.06375,3.19549 -5.10179,1.6669 0,0 z m -18.80185,3.85761 c 6.8409,3.98995 -8.60624,3.09393 0,0 z m 208.202495,0.81314 -0.22259,0.29779 z m 446.44207,6.04011 0.37366,1.66872 z m -651.653165,0.17409 -0.0212,0.0573 z m 186.906035,1.1316 -3.8441,6.05781 z m -4.97221,2.01266 c 3.07206,-0.33253 -2.72697,1.80098 0,0 z m -212.149268,0.81101 -0.202874,0.36685 z m 550.124018,2.83853 c -1.77393,5.33253 -1.30592,3.92568 0,0 z m -127.67892,3.15063 c 3.88705,12.70192 -6.55013,9.85081 -3.06497,1.95224 l 1.22152,-1.37487 z m -192.70838,0.1189 -0.11676,0.28449 z m 446.29984,1.6666 c 1.07207,1.80245 -2.81722,-0.42329 0,0 z m -446.36778,0.276 c 4.92882,-0.31257 -2.83629,2.0895 0,0 z m 457.56057,23.94179 c 2.65591,4.14475 -6.34331,2.03423 0,0 z m -472.55788,1.18892 0.24203,0.0849 z m 471.8785,8.52834 c 6.00577,2.09978 -1.47558,3.60781 0,0 z m -17.86134,0.35243 0.12484,0.72642 z m 31.66338,0.33332 -0.10596,0.23498 z m -30.88209,0.47982 c 2.23254,1.562 -1.88766,1.03198 0,0 z m -0.61993,0.16983 0.0594,0.0297 z m 17.20955,0.60933 0.138,0.42248 z m -92.56134,3.55825 c 4.12239,0.42713 -6.22018,1.67959 0,0 z m -122.61753,1.15495 c 20.18868,16.63758 -7.41202,13.89363 -13.39536,9.35312 -29.7988,6.09897 1.64036,-2.61846 9.91365,-8.36861 z m 173.73667,5.39683 c -23.08523,2.03982 -7.55582,17.36618 0,0 z m -428.59136,3.71961 c 6.1258,1.47491 -4.61459,3.66642 0,0 z m 403.5392,0.32483 c 2.28425,5.06583 -5.64956,2.83807 0,0 z m -397.79419,1.80248 c 3.89332,1.32347 -2.4991,2.22578 0,0 z m 413.36262,8.08674 c -1.87729,4.03891 -3.80882,0.35906 0,0 z m -134.93768,4.59219 c 8.8596,3.50081 -7.50934,5.52581 0,0 z m -31.86294,0.0807 c -9.13958,10.49437 -32.72955,46.98714 -15.14765,13.20236 4.031,-5.34772 8.62323,-10.82335 15.14765,-13.20236 z m 14.75317,0.0382 c 23.52882,0.34804 -8.57021,31.46392 2.84032,3.88057 1.19792,-1.61585 -5.41076,-2.7199 -2.84032,-3.88057 z m 8.23112,2.18463 c 2.56388,-0.83469 -0.0954,3.15705 0,0 z m 11.7278,1.67934 c 4.35268,4.71673 -6.73111,5.18603 0,0 z m 99.33603,2.18251 c -5.80066,8.85298 -6.83257,-0.30879 0,0 z m 44.19794,6.10381 c -12.8952,-1.85929 -12.06318,11.69363 0,0 z m -127.74262,4.42871 c 17.1422,2.46987 -23.84656,1.22359 0,0 z m -329.04939,7.08042 c 2.78214,4.92652 -5.57661,0.7464 0,0 z m 300.45809,4.33317 c 2.32606,8.9989 -25.1495,4.52414 0,0 z m -14.29246,5.56667 c 1.38794,3.00441 -5.74424,-2.54947 0,0 z m 51.28472,21.48966 -0.0828,0.0998 z m -0.31209,0.39064 -0.0509,0.0679 z m -18.01631,2.29291 -0.18472,0.48193 z m 6.94666,3.1294 c 4.01794,-0.58652 0.21261,3.15312 0,0 z m -328.33605,39.5633 c 11.98001,2.74305 -5.54938,4.58804 0,0 z m 388.83275,5.36497 c -29.07027,25.55247 32.15982,13.71166 0,0 z m -100.67993,0.50317 0.98854,0.62432 z m -262.63783,16.30726 c 22.25032,14.86126 -9.06998,30.52453 0,0 z m 202.66765,5.94458 c 4.25241,2.00094 -3.93915,1.3761 0,0 z m -19.20523,0.0446 c 8.03805,3.42654 -4.75061,5.60036 0,0 z m 11.76815,0.15923 c 4.73856,0.97911 -2.78064,1.80949 0,0 z m 8.49649,1.31629 c 3.26984,1.62611 -2.14656,1.35784 0,0 z m -14.10775,0.85773 0.26746,0.48863 z m -2.2823,0.70485 0.051,0.0616 z m 13.27552,1.38636 0.28024,0.017 z m -229.40552,3.65167 c -13.42375,4.1582 -3.56946,17.42404 0,0 z m 162.82411,9.06336 -0.0679,0.017 z m -22.27942,12.21611 -0.67938,0.39277 z m 147.71427,1.81522 c -27.22445,-1.31504 25.99784,21.49311 -0.95537,24.38127 5.54127,-23.55378 -24.23923,12.39922 4.07687,12.30313 21.21009,9.23838 19.40978,4.87638 17.52704,-7.05223 -2.70725,-3.82439 -12.2612,-16.91479 -20.64854,-29.63217 z M 269.43953,461.9982 c -3.45854,0.42945 1.60715,1.83565 0,0 z m 87.3301,7.50927 0.0633,0.51599 z m -92.24287,0.34394 0.008,0.42812 z m 256.016,2.1995 c 4.63437,4.41082 -2.67747,2.61802 0,0 z m -257.36202,1.66872 c 4.85581,3.9348 -2.25359,2.47084 0,0 z m 218.51632,7.77467 c -16.76143,-7.68958 -48.05005,20.05791 -18.00416,17.16687 13.21785,-25.269 38.19029,32.02029 63.26809,12.96403 1.22933,-13.29143 -33.03267,-24.53746 -45.26393,-30.1309 z m -127.24794,1.70057 c 5.87728,2.15027 -4.25081,5.04301 0,0 z m 193.2264,1.43307 c -12.99139,3.88404 -22.72556,29.82859 -0.91262,15.93781 14.70975,-1.03979 11.07079,-10.95197 0.91262,-15.93781 z m -50.30175,7.1717 c 8.11636,0.44138 -3.69548,6.28422 0,0 z m -35.42544,1.96596 -0.26933,0.11205 z m -176.61979,0.43735 c -4.07458,8.05065 10.02518,1.73212 0,0 z m 255.71453,1.52649 0.0763,0.37133 z m -120.74076,1.93835 c 5.6382,0.79106 -4.07902,2.45249 0,0 z m 79.12658,8.98056 c 10.79886,-4.68497 -1.26753,8.29244 0,0 z m -145.55299,0.32483 c 1.53646,2.00554 -1.99822,0.45744 0,0 z m 120.46263,1.29083 c -29.0694,25.55232 32.16222,13.71058 0,0 z m 64.32671,0.32483 c -8.1879,13.00215 -23.79583,19.99769 1.47147,23.35391 19.94775,-0.53515 46.17321,-8.69935 13.15896,-22.193 -4.65448,-4.8564 -9.85645,0.82617 -14.63043,-1.16091 z m 64.02523,0.15285 c -38.71552,5.57372 -23.7647,33.48057 3.79053,41.85893 16.84917,14.79936 36.01022,-4.68381 14.09764,-12.48897 29.03235,-9.07682 -9.02756,-23.54452 -17.88817,-29.36996 z m -100.20012,10.29687 c -33.00758,15.53439 35.53908,20.37278 0,0 z m 36.17701,2.45 -6e-5,0.23998 z m -176.93613,0.37364 c 5.09185,1.20903 -3.61828,1.98196 0,0 z m 176.91914,0.11253 c 3.87229,3.12429 -4.04145,2.42364 0,0 z m -168.14451,1.27383 c 4.20998,1.99045 -3.8377,1.83741 0,0 z m -6.5815,0.21869 c 1.63141,0.91866 -2.34503,-0.31986 0,0 z m 7.95512,3.65803 c 7.81525,1.59982 -7.26554,4.80934 0,0 z m -10.90618,18.03967 c 2.73881,-0.47252 -1.35982,1.85799 0,0 z m 18.74877,4.45207 c 2.89343,0.27235 -1.23879,2.52493 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.30000001" /> diff --git a/artwork/continent_oceania.svg b/artwork/continent_oceania.svg index 365210036..f8b169eb1 100644 --- a/artwork/continent_oceania.svg +++ b/artwork/continent_oceania.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="454.80923" + width="458.95242" + version="1.1"> + d="m 185.37228,9.9996627 c -24.7892,7.5552303 7.1928,17.4858303 9.011,18.8093303 -13.2664,-3.63757 -13.3047,9.33781 -3.4131,11.27799 0.9523,-10.6103 8.6295,4.28509 12.2435,3.11268 10.7598,3.22107 32.3704,14.466696 26.0784,23.744816 4.9132,4.96386 0.4151,13.03301 12.4207,14.127 7.1054,11.5675 29.0931,4.75241 18.7584,-2.42036 11.8848,-1.34059 6.0946,-10.75505 21.1138,-3.82009 8.2277,11.28086 22.6931,28.227511 36.6692,20.81009 -11.3701,-8.40147 -28.9675,-26.70495 -20.0986,-35.12474 -15.4225,-9.67744 -24.5051,-26.003986 -44.4396,-29.170396 -16.6078,-10.00182 -36.6066,-13.20628 -47.6437,3.9415 -14.0945,-5.67325 -0.7896,-25.5045303 -20.7,-25.2878203 z m 149.6102,33.0306203 c -7.5266,5.921376 -12.2403,14.267626 -19.9763,10.396636 -25.7632,5.41214 19.8756,13.00588 19.9519,-4.86369 2.0847,-1.33043 1.5976,-4.170196 0.024,-5.532946 z m -78.4578,56.664566 c -14.5601,16.178031 -6.0755,43.209231 -22.1966,57.941961 -15.8981,0.8164 -49.6043,-24.76141 -24.6064,-38.06583 5.4174,-15.57717 -25.4501,-3.91192 -33.4622,-16.35022 11.6976,14.51497 -21.6055,6.89996 -20.6162,25.66662 1.6396,10.27623 -16.5322,14.09213 -15.1896,2.61634 -8.5172,-11.38642 -22.2074,5.40791 -26.3611,15.27856 -0.5502,3.09112 -10.718,-1.14522 -7.3813,8.67559 -14.159302,-10.93206 -14.911602,27.67648 -35.796702,25.00349 -17.1949,2.8885 -38.287901,13.2794 -47.009001,21.6121 -5.3238,9.73855 -0.8151,35.94396 -6.2253,30.04673 -3.9728,5.81065 5.9952,35.28029 0.9555,53.35989 -3.0936,10.2037 -18.23250035,20.4246 0.7897,24.6111 16.416,-4.8775 32.368501,-11.8211 50.894401,-10.7422 20.3556,-13.0926 48.353902,-23.3777 71.639702,-15.7988 20.2106,-1.4208 2.2505,37.819 23.1083,18.0098 7.6153,-7.7547 19.3681,-17.8993 9.3461,-2.0408 -6.8377,5.5671 -13.889,18.856 -2.0853,5.9798 8.1207,-3.1353 -8.2579,17.0172 5.576,8.0749 -9.2307,20.2888 14.4166,36.4134 30.234,22.125 -4.151,7.2002 5.6616,-0.7411 4.4219,8.0124 17.5737,-8.9832 37.9973,-10.0035 46.7888,-30.7027 12.9909,-16.6677 33.004,-28.1282 42.1377,-48.4714 10.2178,-19.38489 12.2783,-42.36263 -1.9667,-59.70447 -5.0347,-2.40932 -8.6664,-15.16344 -11.0402,-23.7467 -27.1568,-7.42687 -3.7009,-45.00903 -26.3535,-51.93564 -1.9639,-10.06615 -0.9589,-20.22364 -5.602,-29.455521 z m -46.423,10.292621 0.2718,-0.20806 z m -46.65,-5.10597 c -7.0408,5.68816 5.4972,6.90235 0,0 z m 181.195,0.14862 c -5.0949,0.12508 2.7754,1.65783 0,0 z m -6.9467,0.37366 c -0.4282,4.01852 6.3992,0.10615 0,0 z m 51.4227,1.12947 c 0.5429,2.71313 6.3187,2.1818 0,0 z m -179.6302,0.008 -2.018,1.50855 z m 230.6517,0.66452 c -1.5987,1.33059 3.2088,0.65373 0,0 z m -253.6594,0.12738 c -1.3021,1.08845 0.966,0.29599 0,0 z m -6.8022,0.28874 c -0.4654,1.94003 1.7527,-0.59618 0,0 z m 28.3705,2.94893 c -1.5059,1.60861 -0.7732,0.82592 0,0 z m 234.4987,14.96973 c -2.8392,2.17569 1.8799,2.89387 0,0 z m -0.1508,3.86185 c -3.917,0.30225 1.7899,3.1331 0,0 z m -8.2799,4.74505 c -3.6656,13.21788 8.8386,7.38541 0,0 z m 11.2416,2.27379 c -3.9865,7.24064 2.1576,2.78917 0,0 z m -1.3693,2.73026 c -3.4664,-0.45066 -1.2261,4.33096 0,0 z m 0.9383,1.7303 c -5.0654,0.72577 -18.2096,11.62926 -3.084,13.90854 8.333,-1.3957 2.5417,-8.96028 3.084,-13.90854 z m -7.6091,1.29932 c -2.5666,0.12319 1.4543,2.27932 0,0 z m 5.7856,16.45586 c -5.6874,1.05523 2.8488,4.09817 0,0 z m -168.3462,6.07409 c -2.0313,2.54502 2.2383,2.83573 0,0 z m 171.327,3.3693 c -4.264,3.92984 4.5729,3.92975 0,0 z m -69.4857,4.70046 c -0.8154,2.12351 -0.5372,1.39914 0,0 z m 70.0504,1.29083 c -3.3899,1.59382 2.5525,4.16006 0,0 z m -41.8307,6.69826 c 2.2991,22.50699 28.757,21.31655 10.8183,3.66167 -4.9865,1.24545 -7.8802,0.32212 -10.8183,-3.66167 z m 43.6417,0.5244 c -1.9449,0.9936 1.7676,0.5609 0,0 z m -156.4613,0.0467 c -2.3181,2.54084 1.3455,1.30902 0,0 z m 131.6894,2.59013 c -4.0049,3.8521 0.2876,1.88688 0,0 z m 3.3863,2.1167 c -3.5073,3.63089 5.519,6.27638 0,0 z m 4.5943,5.74713 c -4.4717,4.30442 5.3335,1.95847 0,0 z m -6.089,10.37966 c -1.6043,1.28663 1.8908,0.46676 0,0 z m -4.452,32.85865 c -22.7934,16.05049 22.5492,13.91459 0,0 z m 5.3905,69.53879 c -2.7692,16.2666 3.2577,28.9805 -16.8546,41.5654 -4.3359,1.4291 6.5544,11.8409 -5.5923,15.6363 -0.4838,11.1242 21.7206,-11.2186 29.0191,-16.0053 9.5472,-2.915 22.5515,-18.5942 3.5973,-10.6667 -6.8021,-2.0798 0.2783,-18.6411 -7.3145,-6.5113 -0.4879,-9.1765 1.9552,-17.9664 -2.855,-24.0184 z m -261.7717,10.7534 c -20.9143,3.5105 12.4637,4.1758 0,0 z m 270.7415,3.4669 c -2.3859,2.2146 0.6619,2.6991 0,0 z m -5.1101,5.9786 c -3.0577,-0.6644 -0.2902,1.7697 0,0 z m -235.6325,24.6042 c -6.2563,3.2449 -0.1534,7.8157 0,0 z m 26.9821,1.3163 c -6.5025,6.2092 5.6289,4.8134 0,0 z m -0.5945,4.8894 c -6.4222,1.6239 4.0188,2.1706 0,0 z m -0.8451,1.5201 c -1.4421,-0.2983 -0.6584,2.6337 0,0 z m 172.7219,0.059 c -18.4971,12.2995 -35.8725,26.5459 -57.469,33.1457 -12.5214,4.267 -28.5559,20.3086 -4.8423,18.3068 16.3346,-7.8996 31.4347,-19.9409 47.865,-28.952 8.0795,-4.5743 31.6487,-23.8023 11.8944,-16.0103 l 1.3561,-4.3722 z m -198.1412,1.3206 c -7.0446,9.9959 -7.6903,34.0486 8.3565,19.2495 6.2431,1.4934 23.6378,-25.5187 3.3505,-15.4746 -4.8542,1.7088 -8.8905,-0.1882 -11.707,-3.7749 z m 205.0603,0.1995 c -3.369,1.1708 -1.6233,3.2236 0,0 z m 45.8857,26.1201 c -7.037,4.3956 4.4945,0.9414 0,0 z m -0.6772,4.261 -0.7898,0.7197 z m -122.6451,10.0612 -0.4124,0.6034 z m -3.6624,10.7087 c -9.0353,1.4032 -4.8128,11.7243 0,0 z m -37.5251,32.6188 c -8.8024,1.5227 -0.8381,4.4504 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.5" /> diff --git a/artwork/continent_south_america.svg b/artwork/continent_south_america.svg index f6d33d33c..5f30a5867 100644 --- a/artwork/continent_south_america.svg +++ b/artwork/continent_south_america.svg @@ -1,218 +1,12 @@ - - - - image/svg+xml - - World Map - - - - - - World Map - + height="610.44" + width="378.41562" + version="1.1"> + d="m 88.4849,10 c -18.24175,7.87894 -34.06561,18.50036 -45.80446,32.93615 -10.883617,19.307865 6.31851,49.468955 -19.399157,63.81594 -10.52775,12.21945 -14.5126598,31.41079 -9.83423,42.81633 -13.91620976,23.45902 18.43218,39.2645 23.823757,60.76558 11.22393,22.28784 18.87562,47.39798 45.81479,55.48706 22.73645,9.83528 23.94026,36.32421 22.37125,57.50238 3.95557,21.80669 -0.72078,44.66917 3.81838,66.07027 11.17285,20.8485 -3.65439,43.2221 4.41943,63.5951 6.54277,22.9505 5.78874,43.2996 13.16434,61.7851 -6.17313,11.5655 13.95871,9.3944 2.95983,22.1407 11.1813,19.2793 22.12261,40.1853 42.46204,50.531 15.63868,4.8906 44.98575,22.5804 52.01091,6.1542 11.91513,0.5837 21.72115,-7.5489 3.16949,-6.209 -22.26669,-2.057 -48.72586,-28.6577 -30.80998,-50.2018 11.79483,-9.4744 -28.80345,-21.8938 -4.8528,-29.7659 -4.48037,-12.4913 15.65669,-25.4722 -6.62898,-28.3688 -0.11836,-10.3351 22.61943,4.1412 16.80524,-14.4278 5.50412,-11.7227 40.39225,-7.9904 26.67406,-33.9509 -16.55123,-20.0606 14.8362,2.7872 20.6571,-16.0977 13.00703,-22.2687 33.0682,-45.2539 27.16794,-73.09192 9.2071,-17.21567 35.48076,-18.11317 46.80312,-23.17073 7.367,-18.37532 17.84761,-39.87294 14.48915,-61.55553 -3.85354,-28.78823 25.6248,-44.8669 30.645,-70.1816 0.3626,-24.72793 -26.2339,-34.97029 -44.62773,-43.44039 -14.52901,-3.11953 -30.16204,-2.01392 -35.42281,-16.80128 -10.56807,-1.13461 -22.29419,-5.93114 -31.86475,-6.83183 -9.99687,-8.75375 -6.96852,-35.981495 -20.67078,-38.652825 -1.47136,16.2775 -22.66172,23.707495 -16.94662,2.00971 9.39734,-28.95446 -28.55241,-7.37708 -34.61907,-31.338785 -14.53757,-7.36849 -12.82418,-17.38328 -12.8111,-31.0189 -16.33868,2.80917 -26.58292,0.5376 -38.78885,8.62466 C 117.23436,31.98596 100.35156,3.07439 91.3187,21.62745 77.97206,27.23737 105.47899,10.18798 88.4849,10 Z m 47.19147,12.2798 c -11.46415,4.09534 7.63082,7.40597 0,0 z m -62.34589,1.03605 c 5.11193,3.07255 -5.75577,1.75483 0,0 z m 21.35377,2.33112 0.17622,0.15287 z m -7.49017,6.2779 c 7.44946,9.27322 -6.34241,6.88559 0,0 z m -62.492367,79.72529 c -3.19984,0.54314 -5.77851,0.98084 0,0 z M 272.1469,127.13791 c 2.30319,-1.90297 1.46555,2.898 0,0 z m 7.60057,7.9445 c 4.57972,3.7083 -5.96751,2.45804 0,0 z m 9.87224,5.09536 0.23779,0.88107 z m 46.8815,89.55507 -0.44833,0.32457 z m 0.0255,0.47556 0.0106,0.19958 z m -1.49251,8.8914 -0.83013,0.71123 z m -230.92776,14.0844 c 3.34802,2.40737 -7.56603,1.74837 0,0 z m 193.53211,69.87427 c 3.28893,-0.53061 -0.1279,1.63208 0,0 z m -45.48452,80.56814 c 1.67655,2.3923 -2.69345,0.455 0,0 z m -138.53626,24.5087 c 2.20544,0.2854 -1.50973,2.5135 0,0 z m 61.41598,43.9622 c 2.69558,0.077 -1.5877,1.8031 0,0 z m 8.04853,10.057 c 5.64822,0.8467 -3.45492,2.4737 0,0 z m -52.55219,11.2564 c 6.2183,4.3896 -5.77906,5.2069 0,0 z m 10.86371,36.0646 c 0.88979,1.3015 -1.76857,0.7247 0,0 z m 0.76006,0.8725 0.12235,0.045 z m 52.18279,0.1593 c 1.41492,1.902 -1.82569,0.6391 0,0 z m -3.48395,5.6898 c 4.80513,1.0521 -1.50988,4.0619 0,0 z m -6.52418,14.7638 0.2003,1.3352 z m 62.05291,4.125 c -24.88089,17.4315 30.77942,22.5104 17.96359,5.8882 -5.10045,-2.5435 -14.61466,-1.4938 -17.96359,-5.8882 z m -89.6039,15.7532 c 3.39232,0.228 -2.275,1.444 0,0 z m -2.87888,0.5562 c 2.08406,-0.1161 -1.164,0.9868 0,0 z m 50.50556,8.2439 c 9.39751,1.9632 -5.95026,6.237 0,0 z" + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.5" /> From f3db4f1c6b107e80aee215bf74575ccdf01a766b Mon Sep 17 00:00:00 2001 From: Ialokim Date: Fri, 16 Feb 2018 14:22:39 -0600 Subject: [PATCH 6/9] removed unused translations to satisfy lint --- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-eo/strings.xml | 2 -- app/src/main/res/values-eu/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- 9 files changed, 20 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 22d52e074..5bf0ac213 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -273,9 +273,7 @@ es welche gibt) anzeigen lassen. Öffentliche Verkehrsmittel in Kalifornien (USA) Oregon Global Transport im Bundesstaat Oregon (USA) - Costa Rica Costa Rica - Afrika Ghana Accra Koordinator diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index eedc73658..11bcfb4dd 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -259,9 +259,7 @@ Vi ankaŭ povas esplori proksimajn staciojn kaj rigardi baldaŭajn forveturojn i Publika transporto en Kalifornio (Usono) Oregono Global Transport en Oregono Ŝtato (Usono) - Kostariko Kostariko - Afriko Ganao Akrao Prizorganto diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index cdf65c9d5..3f08542bd 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -264,9 +264,7 @@ Hurbileko geltokiak aurkitu ditzakezu ere eta hurrengo irteerak ikusi atzerapek Kaliforniako (EEBB) garraio publikoa Oregon Oregon estatuko (EEBB) garraio orokorra - Costa Rica Costa Rica - Afrika Ghana Accra Mantentzailea diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fdde9908c..7c471d6d3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -260,9 +260,7 @@ Vous pouvez aussi découvrir les arrêts, stations alentour et afficher les proc Transports en commun en Californie (É.-U.) Oregon « Global Transport » dans l’état de l’Oregon (É.-U.) - Costa Rica Costa Rica - Afrique Ghana Accra Mainteneur diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6a00ed0a5..fd158ee82 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -260,10 +260,6 @@ Puoi anche scoprire stazioni vicine e visualizzare le prossime partenze, inclusi Trasporto pubblico in California (USA) Oregon Trasporto pubblico nello Stato dell\'Oregon (USA) - Costa Rica - Costa Rica - Africa - Ghana Accra Mantenitori Contributori diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2b2852c1e..9eb0b2daa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -263,9 +263,7 @@ カリフォルニアの公共交通機関 (米国) オレゴン オレゴン州 (米国) のグローバルトランスポート - コスタリカ コスタリカ - アフリカ ガーナ アクラ メンテナー diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f639bb16e..832f97b2b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -264,9 +264,7 @@ Du kan oppdage stasjoner i nærheten og vise kommende avganger, inkludert forsin California Oregon Transport for hele staten Oregon (USA) - Costa Rica Costa Rica - Afrika Ghana Accra Utgivelsesansvarlig diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cf846c4cc..77e32cfb2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -261,9 +261,7 @@ Możesz także przeszukiwać pobliskie stacje i przyszłe odjazdy wraz z opóźn Transport publiczny w Stanie Kalifornia (USA) Oregon Global Transport w stanie Oregon (USA) - Kostaryka Kostaryka - Afryka Ghana Akra Opiekun diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 293ab555b..15a6a4b4d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -246,9 +246,7 @@ Você pode também descobrir terminais por perto e visualizar os ônibus que est Transporte público na Califórnia (EUA) Oregon Transporte Global no estado de Oregon (EUA) - Costa Rica Costa Rica - África Gana Mantenedores Contribuidores From 121a8dbd9368c56a1844c437aa75530e47c019b6 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Sat, 17 Feb 2018 10:56:50 -0600 Subject: [PATCH 7/9] addressed some requested changes --- .../grobox/transportr/networks/ContinentItem.java | 2 +- .../de/grobox/transportr/networks/CountryItem.java | 2 +- .../networks/PickTransportNetworkActivity.java | 3 +-- .../transportr/networks/TransportNetworkItem.java | 2 +- app/src/main/res/drawable/continent_africa.xml | 10 +++++----- app/src/main/res/drawable/continent_asia.xml | 10 +++++----- .../res/drawable/continent_central_america.xml | 10 +++++----- app/src/main/res/drawable/continent_europe.xml | 10 +++++----- .../main/res/drawable/continent_north_america.xml | 10 +++++----- app/src/main/res/drawable/continent_oceania.xml | 10 +++++----- .../main/res/drawable/continent_south_america.xml | 10 +++++----- artwork/continent_africa.svg | 14 +++++++------- artwork/continent_asia.svg | 12 ++++++------ artwork/continent_central_america.svg | 12 ++++++------ artwork/continent_europe.svg | 12 ++++++------ artwork/continent_north_america.svg | 12 ++++++------ artwork/continent_oceania.svg | 12 ++++++------ artwork/continent_south_america.svg | 12 ++++++------ 18 files changed, 82 insertions(+), 83 deletions(-) diff --git a/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java index a4653e78f..9fd2ebaee 100644 --- a/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java +++ b/app/src/main/java/de/grobox/transportr/networks/ContinentItem.java @@ -42,7 +42,7 @@ class ContinentItem extends ParentRegionItem + android:viewportWidth="64" + android:viewportHeight="77.11899" + android:width="64dp" + android:height="77.118988dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_asia.xml b/app/src/main/res/drawable/continent_asia.xml index ab518e099..014399000 100644 --- a/app/src/main/res/drawable/continent_asia.xml +++ b/app/src/main/res/drawable/continent_asia.xml @@ -1,10 +1,10 @@ + android:viewportWidth="63.99973" + android:viewportHeight="52.38704" + android:width="63.999729dp" + android:height="52.387039dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_central_america.xml b/app/src/main/res/drawable/continent_central_america.xml index 6bf28ae0e..56f85bcd7 100644 --- a/app/src/main/res/drawable/continent_central_america.xml +++ b/app/src/main/res/drawable/continent_central_america.xml @@ -1,10 +1,10 @@ + android:viewportWidth="63.99999" + android:viewportHeight="58.455" + android:width="63.999989dp" + android:height="58.455002dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_europe.xml b/app/src/main/res/drawable/continent_europe.xml index 03395929b..d21fb9f9e 100644 --- a/app/src/main/res/drawable/continent_europe.xml +++ b/app/src/main/res/drawable/continent_europe.xml @@ -1,10 +1,10 @@ + android:viewportWidth="63.99919" + android:viewportHeight="50.34941" + android:width="63.999187dp" + android:height="50.349415dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_north_america.xml b/app/src/main/res/drawable/continent_north_america.xml index 720233b8e..c6d96c75a 100644 --- a/app/src/main/res/drawable/continent_north_america.xml +++ b/app/src/main/res/drawable/continent_north_america.xml @@ -1,10 +1,10 @@ + android:viewportWidth="64.00001" + android:viewportHeight="42.32123" + android:width="64.000008dp" + android:height="42.321232dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_oceania.xml b/app/src/main/res/drawable/continent_oceania.xml index dd87971d6..7e9ea649d 100644 --- a/app/src/main/res/drawable/continent_oceania.xml +++ b/app/src/main/res/drawable/continent_oceania.xml @@ -1,10 +1,10 @@ + android:viewportWidth="63.99999" + android:viewportHeight="63.39649" + android:width="63.999989dp" + android:height="63.396488dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/continent_south_america.xml b/app/src/main/res/drawable/continent_south_america.xml index a580d18f1..b8d5a6532 100644 --- a/app/src/main/res/drawable/continent_south_america.xml +++ b/app/src/main/res/drawable/continent_south_america.xml @@ -1,10 +1,10 @@ + android:viewportWidth="64" + android:viewportHeight="105.4311" + android:width="64dp" + android:height="105.43111dp"> \ No newline at end of file diff --git a/artwork/continent_africa.svg b/artwork/continent_africa.svg index 5b336c7b1..e51a95242 100644 --- a/artwork/continent_africa.svg +++ b/artwork/continent_africa.svg @@ -2,11 +2,11 @@ - + version="1.1" + width="64" + height="77.118988"> + diff --git a/artwork/continent_asia.svg b/artwork/continent_asia.svg index c347729dd..a11ba8716 100644 --- a/artwork/continent_asia.svg +++ b/artwork/continent_asia.svg @@ -2,11 +2,11 @@ + version="1.1" + width="63.999729" + height="52.387039"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.02062405" + d="m 8.3201494,1e-5 c -1.23926,0.51007 -6.0791,0.51348 -2.29258,0.93559 C 6.9702094,1.13525 11.805739,0.915 9.7202294,0.094 9.2003494,0.1118 8.8087694,0.21898 8.3201494,0 Z M 20.230129,0.20318 c -2.77227,0.97097 1.94705,1.30749 2.96429,1.42855 1.54983,0.2587 2.38629,0.0787 0.32587,0.52861 -1.98064,-0.186 -4.77778,1.36405 -6.28794,1.90158 -0.58137,-1.7844 -0.99581,1.52154 -1.40331,-0.0572 -2.57166,-1.9283 -0.57006,3.46338 -3.42324,1.44094 -2.13976,0.16102 -3.5579496,-2.06471 -0.84024,-2.44652 1.93278,-0.13715 2.08652,-1.40887 0.0369,-0.84066 -2.6941496,-0.64653 -5.0083496,3.69105 -1.21146,3.09481 2.16203,0.95818 -2.8671196,0.57181 -3.2532496,1.4167 -1.0023,-1.72997 -1.20332,0.3192 -1.32728,0.36795 -0.84967,1.07426 -4.52482,0.74331 -1.66294,0.38831 2.87423,-0.80583 -2.29848,-2.11862 -3.34744001,-1.99695 -2.58661999,0.66421 2.15986001,4.19047 -0.47843,4.98618 -1.05487,2.51798 2.23447001,2.68879 2.54538001,4.74184 1.24555,1.03414 5.06004,1.13789 2.82726,3.18714 -1.36998,1.33672 4.13062,2.67118 0.95675,3.06268 -2.00284,-0.90078 -4.32802,-0.36776 -6.08093001,-0.12126 -0.45697,2.34887 1.37086001,3.55481 3.45421001,3.18348 0.43591,0.24912 -1.21112,1.09781 0.41054,1.01063 1.22131,-0.63201 1.21683,-1.21669 0.88782,0.44373 -1.2734,2.86277 1.71816,5.11315 2.77716,7.54328 1.53457,1.50687 1.18984,4.08471 2.8444596,4.96725 2.59345,-1.02767 5.55916,-2.21598 7.13764,-4.60695 1.74967,-1.42973 -2.59765,-3.37804 -1.13648,-3.34773 1.89372,1.24679 5.55941,-0.51328 6.60627,2.74838 3.01896,0.57637 1.9763,4.9399 3.88966,6.94405 0.88285,1.44915 2.23783,-0.37224 2.20718,2.02268 2.37958,0.43581 -1.677,-4.03025 0.20934,-5.60507 1.55385,-1.50239 4.33268,-5.67518 5.97646,-2.23824 0.7398,0.894 0.73365,3.47074 1.93159,1.8274 1.77262,1.71254 0.30203,4.84477 2.46667,6.56632 0.66616,1.20053 0.83844,2.4345 -0.60014,0.80007 -1.38317,-2.16221 -2.9284,-0.65407 -0.9541,0.90865 -0.28986,1.77088 1.3351,-0.01 0.60345,1.81538 0.28415,1.20638 1.90226,2.5172 0.65705,0.50627 -0.59506,-1.67421 1.52658,2.08446 2.16699,2.54079 1.24458,1.20449 4.07864,1.82347 6.53239,2.02564 1.33677,0.18612 2.33195,1.17111 2.04364,-0.17992 1.44133,0.20879 3.00224,-0.49074 1.10877,1.22507 1.14484,-0.41665 3.99978,-2.81329 0.90991,-1.83416 -1.91189,0.29516 -3.64511,0.35667 -5.44274,-0.26077 2.48673,-0.82995 -3.84671,0.12276 -4.00708,-1.56763 0.42205,-1.1531 2.24683,-1.17253 0.13147,-1.71037 -1.16959,-1.31516 -0.66452,-4.37901 -2.84871,-5.70758 -1.24255,-0.95602 -0.89163,-4.70462 0.81202,-2.06839 1.14997,3.68883 5.53545,-1.21188 2.46633,-3.09341 -2.01261,-0.55552 -0.5681,-4.28803 0.48529,-2.25843 -1.807,1.42934 2.10331,1.37488 0.55667,-0.17894 2.4022,-0.6573 5.10577,-2.81196 4.74467,-5.79101 -0.42536,-1.29745 -3.51265,-2.79354 -1.2322,-4.23164 -1.40808,0.0153 -4.24625,-0.80129 -1.56546,-1.70595 6.9e-4,2.05531 2.37025,-0.73622 2.25234,1.52449 1.19012,0.22958 1.68061,3.63562 2.94804,1.26421 -0.85594,-1.4443 -2.86255,-3.39751 -0.48309,-4.22425 3.05394,-0.38645 -0.30677,-7.07927 2.1374,-3.26237 1.32042,2.11199 1.45201,3.79603 2.22031,6.01724 -0.64139,0.20626 -0.82958,1.33921 -2.41875,1.01773 0.17295,1.85053 -2.15134,0.6173 -1.28135,1.82686 0.34271,0.84207 2.146,2.91344 1.93719,0.33224 2.17244,-0.57046 4.42036,-1.48513 2.9263,-4.20993 -1.18963,-1.2214 -1.36999,-1.3927 0.2292,-1.75314 0.27476,-1.1135 2.20361,-2.72311 0.0523,-1.38018 -1.98552,1.15501 -2.11565,-1.06009 -2.98626,-1.88966 1.42926,-0.37969 -1.94314,-2.2939 -2.77391,-3.51797 -0.16557,0.81495 -2.09226,-0.3296 -3.34317,-0.45551 0.31969,-3.63189 4.50136,-0.96704 5.90655,-2.42253 -1.02164,-2.11806 2.1442,0.39078 2.28207,-0.8617 -1.85769,2.54236 1.46772,4.31224 2.41661,5.77188 -0.11912,1.48838 0.44832,2.59516 0.60939,0.34244 0.36657,-2.06611 0.59843,-3.52599 -1.38914,-4.59096 1.09568,-0.18088 -1.07121,-0.85909 0.75742,-0.86348 1.63463,0.66155 2.61159,-1.72592 3.11186,-1.74981 -2.92521,-0.92198 0.93225,-1.28176 1.95507,-0.4197 1.01459,-2.05795 -4.08293,-1.69885 -5.59617,-2.5813 -2.72775,-1.01489 -5.58205,-0.2862 -8.36969,-0.43742 -2.77164,-1.31113 -6.35687,-0.43254 -9.20372,-1.94165 -2.17539,-0.80603 0.6244,1.6981 -2.00203,1.05635 -1.55284,0.66999 -3.77337,-2.15869 -5.58847,-0.7349 -3.17342,-0.23732 -5.32986,-1.96262 -8.62577,-2.67423 -1.53676,-4.8e-4 -2.77597,-0.56582 -4.25127,-0.9583 z m -1.38583,0.009 c -1.662,-0.0616 1.22163,0.69259 0,0 z m -3.56988,0.10114 c -1.17443,0.63827 1.60181,0.13384 0,0 z m 4.29658,0.0752 c 0.24768,-0.0218 -0.14232,0.13028 0,0 z m -5.21186,0.44837 c 0.9158,0.99578 1.82221,-0.193 0,0 z m 6.91164,0.0471 c 0.36228,-0.0334 -0.23105,0.24946 0,0 z m 4.04045,0.86288 0.029,0.015 z m -7.82416,0.0263 c -0.80774,0.16594 -0.0477,0.23583 0.35149,0.14899 z m 8.04454,0.0223 0.20371,0.0239 z m -5.50055,0.0671 c -0.96388,0.84803 1.75873,0.0227 0,0 z m 20.74807,0.23688 c -0.9671,0.46257 1.03704,0.36806 0,0 z m 1.67745,0.25382 c -0.97683,0.29845 1.0898,0.42138 0,0 z m -4.86712,0.009 c -2.24692,0.47154 2.35883,1.63665 2.96987,0.54149 1.12379,0.97955 3.2832,-0.25554 0.84618,-0.20845 -1.27744,-0.043 -2.54386,-0.224 -3.81605,-0.33304 z m -19.35524,0.0855 c -1.93201,0.22379 1.64898,1.1078 0,0 z m 4.04555,0.18375 c 0.46918,-0.19566 -0.0288,0.41769 0,0 z m -4.75533,0.44779 c -1.27368,0.31859 1.27758,0.37587 0,0 z m 19.81777,0.13282 c 0.59953,0.94093 1.81821,0.18509 0,0 z m -8.36856,0.13135 c 0.12747,0.12905 -0.26257,-0.0423 0,0 z m -0.73327,0.17471 c 0.44526,0.0981 -0.27455,0.16999 0,0 z m 0.18944,0.15603 c 0.14126,0.0558 -0.15985,0.0636 0,0 z m -10.07446,0.34503 c 0.42328,0.007 -0.0609,0.35491 0,0 z m 25.2271,0.35803 c 0.0916,0.0913 -0.14281,-0.008 0,0 z m 12.40829,0.13778 c -1.03825,1.51341 2.76371,-0.0799 0,0 z m -16.11128,0.25556 0.0381,0.052 z m -23.35744,0.24374 c 0.8346,0.66996 0.26273,1.34083 0,0 z m -5.36206,0.13063 -0.0341,0.005 z m 42.88127,0.24068 c 0.29629,-0.005 -0.12963,0.1514 0,0 z m -0.65534,0.14639 c 0.33103,0.0846 -0.13259,0.40775 0,0 z M 7.6761994,5.55336 c -1.08229,1.36353 1.93431,0.054 0,0 z m 4.0484696,0.14815 c 1.00448,0.0335 0.18605,0.58131 0,0 z m 42.08012,0.0956 0.22981,0.11276 z m -51.4580896,0.006 c 0.13208,0.0939 -0.16415,0.02 0,0 z m 12.4149796,0.003 c 1.5265,0.49525 -0.74634,0.0881 0,0 z m -2.74598,0.0743 10e-4,10e-4 z m 45.6468,0.0117 c 0.29312,0.136 -0.26953,0.10877 0,0 z m -45.63103,0.003 6.9e-4,7.2e-4 z m 0.20929,0.0382 -8.9e-4,0.0702 z m 46.15311,0.0543 c 0.63078,0.14116 -0.42747,0.31742 0,0 z m -41.05741,0.052 c 0.89897,0.55739 -0.28545,1.52816 0,0 z m -7.27566,0.0746 c 0.20515,-0.1168 -0.008,0.15936 0,0 z m 5.22543,0.006 0.0443,0.0176 z m -5.4031996,0.0112 -0.003,0.006 z m 49.3283296,0.0969 c 0.17465,0.43857 -0.2108,0.11537 0,0 z m 0.55302,0.0814 c 0.4533,0.20562 -0.3952,0.21615 0,0 z m 0.62162,0.18828 c 0.18577,0.0578 -0.12895,0.0874 0,0 z m 0.41816,0.34372 c 0.30151,-0.0414 -0.0987,0.25457 0,0 z m 1.63817,0.0477 c 0.35029,0.21355 -0.45681,0.0746 0,0 z m -45.18936,0.13603 c 0.32916,0.19142 -0.43013,0.1506 0,0 z m 42.68203,0.28811 c 0.28634,0.006 -0.134,0.16223 0,0 z m -57.4540296,0.0201 0.0441,0.0366 z m -0.0245,0.0705 0.0337,0.0338 z m 0.11954,0.0355 0.0175,0.008 z m 60.4939496,0.3211 c 0.36753,-0.0203 -0.24271,0.24391 0,0 z M 4.6065194,7.89969 c 0.69395,0.18512 -0.37661,0.23074 0,0 z m -1.27214,0.18084 c 1.51775,0.63173 -0.76301,0.1455 0,0 z m 0.6136,0.37977 -0.0212,0.0125 z M 61.621949,8.89933 c 0.20742,-0.0605 -0.0531,0.16869 0,0 z m 0.0414,0.0814 c 0.18672,0.064 -0.1517,0.0995 0,0 z m 0.16318,0.28272 c 0.29684,0.14732 -0.30696,0.10453 0,0 z m -5.79554,0.0922 c 0.28937,0.31005 -0.28871,0.12013 0,0 z M 3.4935694,9.65252 c -0.0449,0.31028 -0.424,-0.22188 0,0 z m 51.0009696,0.0706 c 0.39289,0.036 -0.16165,0.18053 0,0 z m -50.7897696,0.17106 0.0232,0.0216 z m -2.06437,0.008 c 1.67116,0.39494 0.0306,1.10109 0,0 z m 52.4764096,1.10356 c 0.37474,0.25479 -0.41403,0.0492 0,0 z m 7.06943,2.101 c -0.30825,1.0825 3.47976,0.87533 0,0 z m -24.70256,0.33059 c 0.42609,1.22311 -0.67806,1.47539 0,0 z m 13.12008,0.65519 0.002,0.0133 z m 2.4999,0.26257 c 0.18742,0.003 -0.11519,0.15754 0,0 z m 0.18653,0.0588 0.068,0.0387 z m -0.1137,0.16916 0.0257,0.0371 z m 0.45728,0.35233 c 0.13386,0.26704 0.0769,0.15338 0,0 z m 0.14318,0.074 0.004,0.004 z m 0.0166,0.019 0.004,0.005 z m -16.84104,0.0328 c 0.12621,0.2049 -0.25221,0.16897 0,0 z m 16.81447,0.13647 0.003,0.0143 z m 0.21879,0.069 0.01,0.042 z m -0.89061,0.0941 0.0819,0.0582 z m -8.17824,2.3446 c 0.12496,0.0642 -0.14549,0.11107 0,0 z m 10.59568,0.0531 c 0.5324,0.20552 -0.34392,0.22993 0,0 z m 4.53551,0.0247 c -1.14737,0.30252 0.55072,0.88111 0,0 z m -46.98562,0.30928 c 1.93628,0.20111 -1.5754,1.94949 0.60643,2.33993 0.87384,1.15136 2.5893,4.44318 -0.33275,3.07949 0.0599,-1.18244 -0.11757,-2.39154 -1.48042,-3.29482 -0.59834,-0.92074 0.45188,-1.76751 1.20674,-2.1246 z m 4.42502,0.12713 -0.0124,0.0197 z m 0.23514,0.0193 0.19468,0.11399 z m 6.41336,0.0333 -0.0378,0.0244 z m 2.28111,0.0223 c 0.45689,0.13085 -0.32041,0.28147 0,0 z m -2.35453,0.0631 -0.065,0.0729 z m -0.21879,0.26068 -0.0141,0.16803 z m -6.90288,0.67897 c 0.50491,-0.13586 -0.0788,0.2861 0,0 z m 0.0574,0.061 0.004,-0.007 z m 41.82981,0.35 c -0.80968,0.16327 0.46025,0.58753 0,0 z m -44.96023,0.42224 c 0.50517,0.23703 -0.41818,0.27314 0,0 z m 0.86652,0.8029 c 0.62437,0.75358 -0.72478,0.31055 0,0 z m 0.17384,0.20462 c 0.18043,0.0693 -0.13007,0.085 0,0 z m 24.70898,0.11677 -0.0241,0.0158 z m -24.65716,0.0613 c 0.41452,0.0571 -0.22193,0.33022 0,0 z M 1.7057794,21.63495 c 1.10597,0.11116 -1.21040001,0.0299 0,0 z m 12.5701296,0.25906 c 0.37379,0.20308 -0.45708,0.23813 0,0 z m -0.16916,0.35555 c -0.0613,0.3146 -0.0477,0.24472 0,0 z m 0.086,0.35715 0.0896,0.0166 z m 35.9197,0.26301 c 0.37506,0.14569 -0.35893,0.21382 0,0 z m 0.0127,0.5355 -0.0146,0.0256 z m -0.0236,0.0419 -0.0159,0.0184 z m -35.0828,0.44297 c 0.072,0.1206 -0.19206,-0.0265 0,0 z M 5.0390094,24.1458 c 1.39342,0.2007 -0.65041,0.70566 0,0 z m 45.9915396,1.67336 c -1.19819,0.55172 0.98237,0.4948 0,0 z m -2.83706,1.99972 c 0.28019,0.0286 -0.13233,0.1234 0,0 z m -35.53174,0.28096 c 0.97105,1.09263 2.54679,2.25313 3.52457,2.41537 -1.66599,2.57685 -1.92533,-1.03448 -3.64815,-1.3956 -0.22356,-0.32296 -0.11312,-0.74874 0.12358,-1.01977 z m 0.41568,1.38101 0.0349,-0.0115 z m 40.46557,-0.70889 c -1.88616,1.90615 0.3506,1.68711 0,0 z m -4.45423,0.35014 -0.008,0.0379 z m 3.28426,0.90667 c -0.43342,0.59523 0.86435,0.37028 0,0 z m -2.54427,0.70349 c -1.76808,0.80763 0.83469,3.43549 0.36897,0.78232 0.23754,-0.2946 6.9e-4,-0.77251 -0.36897,-0.78232 z m 1.60141,0.10626 c -1.03465,0.66479 0.28874,1.39771 0,0 z m 0.34226,0.0699 c -0.39061,0.99685 1.17039,-0.15088 0,0 z m -17.51184,0.88112 c 0.32335,0.10985 -0.10073,0.27108 0,0 z m -0.031,0.007 -0.0273,0.054 z m 0.0721,0.0496 0.029,0.0501 z m -0.1118,0.0258 -0.006,0.009 z m 16.6691,1.56535 c -0.73104,0.28507 0.11148,0.92712 0,0 z m -6.38315,0.16114 c 0.10584,0.0916 -0.12964,0.007 0,0 z m 0.0334,0.076 c 0.0632,0.15794 -0.14568,-0.0145 0,0 z m 0.17179,0.39437 -0.0725,0.042 z m 5.77087,0.17514 c -1.58541,2.436 0.44574,4.09048 1.28027,6.05151 0.2521,1.08553 -1.64495,3.21086 0.29647,1.50834 0.7321,0.54195 2.41913,1.59801 1.98758,-0.65929 -0.0866,-2.37543 -2.00764,-3.44256 -2.80082,-4.70646 0.30379,-0.79841 -0.1119,-1.70559 -0.7635,-2.1941 z m -19.07369,0.14537 -0.0269,0.0352 z m 4.62733,0.0384 c 0.42434,0.0325 -0.22428,0.30845 0,0 z m -10.61494,0.0861 0.006,0.006 z m 25.42531,0.32081 -0.0396,0.0408 z m -6.03782,0.0919 0.006,0.0203 z m -7.26281,1.28892 -0.0581,0.0566 z m 25.66891,0.0381 c -1.49699,1.354 0.50289,2.9781 0.5075,0.71486 0.31008,-0.37037 -0.12314,-0.74069 -0.5075,-0.71486 z m -12.30392,0.48836 c 0.11489,0.18967 -0.16159,0.0163 0,0 z m -14.69872,0.89163 c -1.0444,1.1594 1.03801,2.6324 0,0 z m 14.86847,0.19792 c 0.0961,0.15916 -0.1459,0.0255 0,0 z m 0.38985,0.25571 c 0.56321,0.7722 0.18178,0.69145 0,0 z m -0.27877,0.0493 c 0.28995,0.11158 -0.1294,0.43698 0,0 z m -35.5424,0.0768 c -0.70265,1.16964 1.59198,-0.1908 0,0 z m 13.95129,0.0749 0.005,0.0478 z m 20.91738,0.0499 c -1.53591,2.30874 -2.35473,5.19693 -5.04857,6.28729 -0.91321,0.7368 -1.01526,2.66524 0.10801,2.87264 1.37237,1.35794 4.04984,1.16496 3.95953,-1.34329 1.6747,-0.98618 -0.89605,-2.5952 1.14791,-3.02122 -1.48712,-1.04054 -1.80274,-2.36009 -0.19854,-3.76748 -0.0337,-0.25696 0.41941,-0.22009 0.0317,-1.02794 z m -35.53773,0.17267 c -0.9704,-0.20576 0.4199,-0.21472 0.17526,0.18438 z m 37.19518,0.35043 c 0.83513,0.26036 -0.57418,0.45478 0,0 z m -15.86373,0.12771 0.053,0.0692 z m 2.78349,0.18989 c 0.27144,0.25284 -0.27449,0.10446 0,0 z m -3.07233,0.0584 c -0.82569,0.75004 0.8233,0.59012 0,0 z m 17.22023,0.18886 c 0.55652,-0.0196 -0.19339,0.39271 0,0 z m -0.46458,0.29352 -0.005,0.0186 z m -23.49871,0.27366 c 0.6166,0.53365 -0.46983,0.37198 0,0 z m 23.70772,0.0562 c 0.10868,0.93952 -1.08636,0.51502 0,0 z m -16.72821,0.1931 c -0.6742,0.33537 0.59116,0.51216 0,0 z m -6.65886,0.20492 0.002,2.7e-4 z m 7.05629,0.0493 c -0.60431,0.76398 1.04254,2.90435 0,0 z m 21.20549,0.1534 c -1.8622,1.49704 2.09765,1.06527 0,0 z m -5.33505,0.82201 0.0854,0.11392 z m -2.73284,0.0987 c -0.71075,0.28637 0.66003,0.4823 0,0 z m -0.56134,0.10333 -0.01,0.0303 z m 0.0939,0.81778 0.0155,0.0458 z m 0.89499,0.525 c 0.0619,0.13383 -0.20251,-0.0212 0,0 z m 3.98337,0.0714 c -0.93766,0.3702 0.85772,1.39915 0,0 z m -9.76095,0.22112 c -0.96222,0.84664 1.04156,0.57466 0,0 z m 9.11935,0.27352 c -0.79134,0.47089 0.92131,0.54073 0,0 z m -8.73564,0.30358 c -0.66693,0.55726 0.67603,0.58123 0,0 z m -1.80312,0.034 c -0.32395,0.80355 0.83013,0.20912 0,0 z m 11.86314,0.0492 c -0.68461,1.13689 -0.57889,4.31127 0.62249,2.00804 0.93201,1.57602 1.82412,-0.22549 0.10388,-0.3476 -0.37096,-0.50503 -0.38136,-1.13923 -0.72637,-1.66044 z m -16.88059,0.0707 c -0.6135,0.88283 1.27372,0.3785 0,0 z m 15.55942,0.0899 c -0.84721,0.49489 0.71311,0.47684 0,0 z m -3.77496,0.10859 c 0.26025,0.40639 -0.35782,0.0629 0,0 z m -10.86437,0.38766 c 0.90671,0.0323 -0.20238,0.75499 0,0 z m 2.32884,0.0746 c 0.504,0.0127 0.0202,0.35984 0,0 z m 12.29881,0.032 c -1.72959,0.49939 -3.95267,0.23732 -3.44953,2.98257 -0.27909,1.5014 1.76222,4.10781 0.88112,0.9544 -0.26049,-0.73149 2.96448,2.14306 1.40814,-0.1862 -0.36164,-1.20114 -0.72152,-1.44773 0.22019,-1.34132 0.8693,-1.83589 -3.32531,-0.34349 -0.71502,-1.49552 0.76896,0.3133 1.81566,0.20032 1.6551,-0.91393 z m -7.8135,0.0397 0.005,0.005 z m 0.0968,0.005 c 0.24576,0.003 -0.13585,0.15956 0,0 z m -0.0813,0.0233 0.004,0.006 z m 0.40896,0.02 0.004,10e-4 z m -4.55449,0.11662 c 0.38435,0.0811 -0.0574,0.35816 0,0 z m 3.29419,0.14303 c 0.17672,0.25063 0.1183,0.16778 0,0 z m 0.15762,0.0238 0.0295,0.0115 z m -2.66978,0.55974 c 0.12866,0.90559 -0.43293,0.83519 0,0 z m 14.25619,0.57608 c -0.0383,0.25962 -0.17367,-0.0714 0,0 z m 1.90119,0.0778 c -1.27221,1.33878 1.11056,0.64937 0.14052,0.1467 z m -2.58615,0.0728 c -0.94825,0.33454 0.46604,0.62981 0,0 z m -2.48195,0.24929 c -1.45357,0.14737 1.37056,1.92811 1.02212,1.55692 1.27445,0.0254 3.3864,0.59536 1.32503,-0.77175 -0.93371,0.0515 -1.92418,0.53241 -1.64099,-0.68514 -0.18356,-0.0391 -0.75872,0.33217 -0.70616,-0.10003 z m 2.63958,0.1318 c -1.45315,0.26336 1.04107,0.80241 0,0 z m -4.99542,0.84697 c 0.13044,0.57247 -0.41183,-0.0496 0,0 z m 6.44999,0.39918 c -0.21474,0.90888 0.96593,0.52506 0,0 z m 0.52923,0.0403 c -0.51835,0.52667 0.81551,0.43677 0,0 z m -0.34022,0.77443 c -1.31616,0.40114 -0.23909,1.65108 0,0 z m -16.45162,0.0992 c -0.83032,0.35449 0.7998,0.47758 0,0 z m 5.51121,0.22755 c -0.81365,0.32679 0.5635,0.56314 0,0 z m 11.52569,0.36868 c -0.94944,0.81856 0.65868,0.75916 0,0 z m 1.9098,0.20594 c -0.33558,0.60134 1.02717,0.38363 0,0 z m -5.15232,0.20097 c -0.74941,0.44467 0.59342,0.52557 0,0 z m 1.52362,0.0509 c -1.94473,1.85794 1.27417,0.5981 0,0 z m -1.02504,0.42385 c -0.70614,0.49229 0.81725,0.42428 0,0 z m -0.94505,0.17515 c -0.68145,0.89067 1.81261,-0.0482 0,0 z m -4.79663,0.71532 c 0.68354,-0.2268 0.0682,0.3269 0,0 z m 0.3805,0.0253 0.009,0.0122 z m 2.87807,0.15573 c 0.2797,0.22422 -0.54399,0.0908 0,0 z m -1.7097,0.49478 c -2.00671,0.46379 0.95688,0.56767 0,0 z" + id="ge-" /> diff --git a/artwork/continent_central_america.svg b/artwork/continent_central_america.svg index 3a86302f5..97eca63b2 100644 --- a/artwork/continent_central_america.svg +++ b/artwork/continent_central_america.svg @@ -2,11 +2,11 @@ + version="1.1" + width="63.999989" + height="58.455002"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.15194049" + d="M 19.584395,0 C 17.501605,1.58135 16.250152,4.38252 13.080334,3.405138 10.871697,3.665854 6.6684892,2.13173 7.1068572,5.828244 c -4.370767,1.117216 2.444497,3.058319 1.716548,5.860724 -1.584874,2.177024 -6.065696,-0.992223 -7.193397,2.49318 -0.298561,2.625567 -3.332564,5.90237 -0.278047,7.950667 2.485639,2.264172 6.533606,0.704619 8.8620058,3.392487 2.481801,0.797077 4.719165,1.584215 7.19698,1.955998 2.167153,0.189465 1.233944,-3.46103 2.036018,-1.177939 1.420978,-0.639805 2.070255,3.524214 0.291999,2.198539 0.189156,2.637605 3.629484,4.150978 4.668625,6.668308 3.076582,1.976037 2.664484,5.30715 1.904767,8.291307 0.440698,1.764004 5.197312,3.072864 3.240819,0.526003 -2.069819,-2.760364 2.391701,0.627012 2.19866,2.026769 1.610894,1.05826 5.467873,2.446221 3.502391,5.09736 0.607139,1.929356 2.779351,0.622759 1.008596,-0.54301 2.153584,-0.405722 1.593856,5.352864 3.485221,2.097564 3.140661,-1.0731 4.167424,2.850003 6.372715,3.222481 1.070111,-3.677107 0.695411,4.876616 3.329116,1.940538 3.760304,-0.614594 0.0675,-3.110946 0.438875,-4.766464 3.031162,-0.390989 3.093823,-5.490228 6.415166,-3.668391 1.573095,0.722745 3.061099,3.835606 3.868491,1.949538 0.04659,1.518083 2.481421,2.431484 0.11514,1.466322 -3.540735,0.377198 0.79391,8.137923 1.324303,3.644683 0.318898,-1.035768 1.209437,0.943312 1.841479,-0.816047 1.669907,-2.865527 -0.841102,-5.720134 -2.771288,-7.635795 -2.08861,-1.539238 -4.17334,-1.273955 -6.141582,-1.991757 -2.947863,1.021192 -5.599666,4.497185 -9.09416,3.901705 -1.200345,-0.887328 -1.574747,-1.719551 -2.301478,-0.604141 -2.258601,-1.035231 -2.39283,-4.259707 -4.755348,-5.447279 -1.63415,-2.849841 -3.909449,-6.085829 -1.983066,-9.335284 -0.159487,-1.481121 0.47686,-1.662948 0.248878,-3.689004 0.702715,-2.069217 0.749128,-1.038888 0.600682,0.581679 0.944614,-2.912117 0.04026,-6.884513 2.479962,-9.464213 -0.557333,-1.551893 -0.02446,-3.633975 0.366035,-4.187294 -0.40327,-0.321431 -2.058621,-2.37219 -1.216501,-0.645652 -0.768662,-1.179159 -2.163111,-0.859109 -2.011596,-0.595814 -2.107734,-1.956157 1.723517,-0.465473 0.869966,-0.893435 -1.854941,-3.13849 -5.686611,-1.96054 -8.552675,-2.6877 -2.863526,1.940126 -6.421507,0.529093 -9.695596,0.984026 -1.284303,0.173666 -4.469031,2.768425 -1.756316,0.785831 0.764301,-1.090196 -1.260169,-1.865666 -1.111288,-0.642151 -1.413765,-0.935721 -3.102741,-0.272006 -0.865351,-1.4164 3.354871,-2.192992 3.208193,-6.018581 4.075211,-9.483894 C 21.033512,1.902011 19.65485,0.596516 19.584395,0 Z m 1.627946,4.965572 c -0.869226,0.734297 0.158297,0.834705 0,0 z m -6.192446,2.615043 c -0.13938,1.187563 -0.983409,5.548353 -0.84522,4.564203 0.269872,-1.523599 0.622485,-3.032256 0.84522,-4.564203 z m 12.356941,3.055902 c -1.5648,0.23919 -1.706829,1.06875 -0.105832,0.04271 z m 11.040816,7.869861 -0.224917,0.141835 z m -25.684846,2.108594 c 0.0041,1.004883 -1.10124,0.25221 0,0 z m -1.640851,1.637628 -0.09017,0.100728 z m 3.745146,0.14086 c 1.518903,1.3894 1.458021,1.641767 0,0 z m 11.893501,0.769889 c -0.725708,0.701823 -0.789969,0.387281 0,0 z m -8.982762,0.205375 c 1.376439,0.411231 -1.530856,-0.158169 0,0 z m -8.6182448,0.188172 c -0.246934,0.330262 -0.43164,0.577297 0,0 z m 9.5741578,0.170967 0.04366,0.0074 z m 0.22903,0.02258 0.535221,0.383541 z M 8.8532522,23.938612 c -0.06251,0.309433 -0.03937,0.194904 0,0 z m 19.3225068,0.09892 c 0.190047,-0.06605 0.03429,0.244438 0,0 z M 8.8091672,24.252585 c 0.03897,0.327069 0.02909,0.244136 0,0 z m 16.7945578,0.01721 c -0.320326,0.459663 -1.333277,-0.0464 0,0 z m -1.908595,2.316121 c -0.297829,0.559835 -1.252582,0.389352 0,0 z m -1.062363,1.127955 -0.149859,0.451922 z m -0.179568,0.452687 -0.02259,0.01828 z m 4.559121,4.868796 c 1.941263,0.398322 5.479597,4.123822 3.192554,5.209574 -2.851144,0.229369 -4.46814,-2.86925 -3.192554,-5.209574 z m 0.899994,4.733316 0.163043,0.05899 4e-4,1.46e-4 -0.163043,-0.059 z m -0.437629,0.08817 -0.06129,0.108602 z m 2.495689,0.797845 c 0.323613,0.113525 0.268762,0.09428 0,0 z m 3.365578,0.38172 c 0.541151,0.701469 0.585143,0.842606 0,0 z m 5.847288,7.193521 0.01616,0.125634 z m 17.646171,5.625784 c -1.150174,0.57986 0.535114,1.352149 0,0 z m -15.732202,0.988165 c -0.592771,0.375987 0.553251,0.209318 0,0 z m 2.654831,3.23225 c -1.816074,1.390352 1.293672,2.030118 0,0 z m 3.003216,0.344085 c -0.500411,0.04533 -1.215018,0.860682 -0.337749,0.274799 z" + id="path2808" /> diff --git a/artwork/continent_europe.svg b/artwork/continent_europe.svg index c0abaa459..210b576f3 100644 --- a/artwork/continent_europe.svg +++ b/artwork/continent_europe.svg @@ -2,11 +2,11 @@ + version="1.1" + width="63.999187" + height="50.349415"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.04754853" + d="m 46.120051,0.01414185 c -2.2793,-0.1233 -4.09714,0.58652 -5.86219,1.08498995 -2.1543,0.85126 -4.96416,1.01563 -6.14815,2.90267 0.57766,0.80779 1.97971,-0.10679 0.33984,1.09559 -1.38257,2.23179 -3.19443,3.65942 -5.72898,4.46389 -3.30622,0.7803202 -2.97409,5.3660502 -0.35959,6.7544302 1.14262,0.79577 5.63406,-2.4201 3.49914,0.0347 -3.00735,0.31883 -2.10757,4.08961 -2.17723,5.28798 -3.33408,-1.48951 -4.08347,3.84554 -6.70293,3.0257 1.38243,-1.82245 -1.11852,-2.40386 -1.1957,-3.78746 -2.17608,-0.84186 -2.22955,-2.88952 -1.73513,-4.56161 -3.34201,0.52557 2.71344,-2.95685 -0.9745,-1.98577 -1.05943,1.13908 -2.87431,1.10832 -3.0808,1.44935 -0.84487,-1.21641 -3.23214,1.33698 -1.06723,2.14363 -0.88174,0.99297 -0.46333,0.84943 0.002,1.12597 -0.85649,0.85936 -2.86364,0.0277 -2.877,1.64209 -1.30318,-0.82194 -2.2736902,1.48667 -0.82162,2.21508 -2.1862402,1.1942 -0.34535,3.16485 1.53426,1.74117 1.68003,-0.24211 3.01439,-1.09674 2.90013,-2.91646 1.03887,0.53817 0.26652,1.57708 0.90496,1.80913 -1.85227,0.37166 -0.71459,1.07851 0.0591,1.57039 -1.02624,0.2787 -2.41136,2.09689 -0.39738,1.70235 1.40552,-0.42398 -0.57494,2.04822 -0.70247,2.61418 2.31653,0.75506 4.6757,2.70633 3.40184,5.53526 -2.70013,1.05491 -6.17619,-1.54943 -8.40648,0.91196 0.11272,2.17522 0.13008,4.22979 -0.9315702,6.12006 0.9405702,0.89199 -0.36968,3.09158 1.8750302,2.43674 1.65464,-0.90744 1.639,3.83214 3.75017,1.76513 0.896,-2.25691 4.6775,-0.95502 5.36404,-3.91038 -0.673,-3.27535 3.82791,-3.17906 4.13227,-5.91206 0.9032,-1.38334 5.18501,1.27301 5.76231,-1.88271 1.56156,0.1146 1.78957,1.89721 0.0571,1.5145 -1.17652,0.75323 0.19387,3.02334 -1.10552,2.56803 -0.34763,1.56332 0.81505,4.87938 2.32248,2.29667 0.48859,-1.23112 -1.22713,-4.93902 0.87182,-3.91835 -0.75981,0.85472 1.2955,-0.11222 1.19801,1.62242 0.72463,0.92408 2.85623,-0.53034 2.1329,1.55371 2.71968,-1.70907 2.58271,4.136 -0.34122,2.1156 -2.61702,0.26833 -0.004,2.00745 0.67687,2.5279 -2.2425,2.61461 2.8583,3.30603 1.7796,0.35331 -1.10216,-2.26363 3.28322,-2.76554 1.45308,-5.16822 1.75462,1.36879 2.71779,-0.55166 0.71255,-1.31006 -2.41701,-1.25732 -4.63435,-2.96265 -5.33089,-5.57359 1.6846,0.71277 2.89282,3.18397 4.56134,3.56935 2.0702,0.1159 2.59303,1.72915 2.31945,3.44176 1.83297,1.3432 2.15148,5.55895 5.11426,5.1504 -0.93279,-1.5584 2.80799,-2.1636 0.83524,-1.00821 0.55372,2.2743 3.5704,-0.91764 3.47112,1.0265 -1.27681,3.22061 3.26753,-0.96871 0.64869,-0.35217 -0.97497,1.13392 1.07968,-1.61261 -0.86169,-1.18078 1.45928,-2.12753 -3.6105,0.55975 -2.6595,-2.33567 -1.0543,0.27289 -3.00662,-1.79764 -0.99388,-1.08214 2.58934,1.24483 2.86651,-2.80761 4.49411,-3.1885 0.14485,-1.94922 1.56069,-5.41557 3.57608,-5.28249 1.67533,0.5368 3.52563,1.25736 4.52245,-0.1692 2.48196,-0.20204 6.28069,-4.30675 2.4164,-5.25109 -2.95089,0.28485 -6.16362,-3.52582 -7.6866,-3.44117 2.01768,-1.62685 -1.87726,-2.12402 -1.95952,-3.91548 -1.99117,-0.53895 -4.26884,-2.23019 -2.93739,-4.62327 -0.81723,-0.6152 -4.83451,-0.49908 -1.7624,-0.95963 2.34915,-0.30687 5.58825,-2.97454 2.95294,-5.1086902 -0.81777,-1.90183 -1.43052,-4.18265 -1.88739,-5.6172 3.76974,-1.60147 -1.55062,-2.72656995 -2.94686,-2.73022995 z m -11.70093,4.46662995 -0.13695,0.0824 z M 16.235931,0.03062185 c -1.90449,0.2919 -1.31429,1.96445995 0.18666,0.73801 0.30666,-0.19274 0.24286,-0.80933 -0.18666,-0.73801 z m 23.61086,2.24812995 c 0.16781,0.47083 -0.29777,0.2442 0,0 z m -0.0535,0.002 -0.0111,0.032 z m 0.61108,0.12887 0.0132,0.0138 z m -3.63247,2.73167 -0.0125,0.0401 z m -28.8332502,0.27122 c -2.52486,1.65477 -5.49487,-0.81052 -7.59383004,1.05717 -1.36161996,1.67695 1.80365004,1.53971 1.00015004,2.60852 2.95095,1.3947302 6.11067,0.0555 8.9237802,-0.93511 1.54932,-0.62213 -1.3991302,-2.56096 -0.8902802,-2.53114 -0.48303,-0.0158 -0.9896,0.0195 -1.43982,-0.19944 z m 36.7388602,1.47519 c 1.42116,1.41047 -5.13605,3.8084402 -1.71233,1.16149 -0.0514,-1.25263 0.86226,-0.98579 1.71233,-1.16149 z m -42.7150302,0.78942 c 0.0998,0.27654 0.0592,0.16421 0,0 z m 29.9410102,1.38501 0.0205,0.0535 z m 9.44844,0.42735 c 0.89658,0.7629402 2.15172,5.3996102 -0.21918,3.3777702 -1.13788,1.28528 1.64813,1.03954 2.16641,1.02741 1.90016,0.29054 1.58618,0.78505 -0.15564,0.81215 -1.16081,0.42861 0.6192,0.268 -0.14311,1.02203 0.12158,1.55569 -1.20485,2.59643 -0.0589,4.4657 -1.21364,1.07253 -3.67493,-1.09173 -5.32573,0.58389 -1.55118,0.94812 -2.23685,-1.29897 -3.21151,-0.44845 0.98733,-1.29005 3.60343,0.99627 2.16149,-1.2709 2.10618,0.24365 2.74986,-1.86432 2.54719,-3.11962 2.22399,-0.87624 1.87612,-2.97775 0.006,-3.64428 0.12969,-1.41897 0.83984,-2.3120402 2.23301,-2.8057002 z m -9.91752,0.24497 c 1.19362,0.22912 -0.88653,0.6763402 0,0 z m -15.93035,0.3166402 c -3.76579,1.69272 3.35641,3.92903 0.86176,0.2387 l -0.40527,-0.19714 z m 12.56843,1.5647 c 0.96102,0.22937 -1.05089,0.21457 0,0 z m 0.0565,0.12316 -0.008,0.0202 z m -6.75885,0.67804 c -2.18661,-0.41769 -1.01392,3.10318 0.34698,0.93053 0.4969,-0.31535 0.2356,-0.97153 -0.34698,-0.93053 z m 7.89048,0.0414 c 0.19891,-0.0228 -0.0141,0.22552 0,0 z m 17.02498,1.31973 c -0.59388,0.89932 -1.42366,-0.18895 0,0 z m -5.44281,2.15626 c -2.20215,0.003 -1.00889,3.37346 0.21222,1.04002 0.17433,-0.22718 0.45745,-1.11119 -0.21222,-1.04002 z m 4.14696,0.0989 c 2.43461,1.63215 -2.14094,0.67333 0,0 z m -29.49179,0.0599 c 0.29989,0.22283 -0.1557,0.16998 0,0 z m 17.38403,0.34726 c 1.47445,0.52125 0.90897,3.1349 -0.0374,1.89066 -1.06337,-0.78246 1.36674,-1.7304 -0.30716,-1.53825 z m -0.86714,1.75146 0.21942,0.10834 z m -1.84233,0.51955 0.008,0.004 z m 2.91943,0.43273 0.0653,0.0215 z m -0.22006,0.16858 c 0.15558,0.0208 -0.22351,0.0278 0,0 z m 0.62151,0.37082 -0.10231,0.0205 z m -16.24364,0.21368 c 0.25732,0.14367 -0.247,0.23724 0,0 z m -1.27363,0.0872 0.12618,0.0983 z m 27.76892,0.13291 c 3.19214,0.24125 -1.21475,1.29036 0,0 z m -2.43252,0.80423 c 0.52486,0.126 -0.26809,0.40773 0,0 z m 0.45798,0.11945 c 0.15588,0.62394 -0.86274,0.1387 0,0 z m -7.55366,0.16758 c -0.425,0.33196 -0.96095,-0.16986 0,0 z m 2.41066,0.19584 c 0.93825,0.85366 -0.78314,-0.0833 0,0 z m -18.57757,0.0165 c 0.43169,0.83617 -0.9681,0.55761 0,0 z m 14.70552,0.0828 c -0.31741,0.75856 -1.16771,0.10122 0,0 z m -0.31496,0.0932 0.031,0.008 z m -13.81548,0.3503 -0.004,0.13848 z m 10.39601,0.0979 c 0.57475,0.32971 -0.21116,0.18854 0,0 z m -17.134,0.64304 c 0.0983,0.22802 -0.45399,-0.096 0,0 z m 2.00988,1.0078 0.0252,0.0131 z m -1.80123,0.65987 c 1.07087,0.67937 -1.17778,0.25187 0,0 z m 10.59118,1.1562 c -0.11352,3.00595 -6.6651,0.42752 -2.33923,0.5385 0.78908,-0.10507 1.63339,-0.12562 2.33923,-0.5385 z m 11.63701,2.05699 c 0.15534,0.19794 -0.19579,0.11738 0,0 z m -16.84361,1.90658 c 0.52118,0.0856 0.006,0.25204 0,0 z m 1.41731,0.8934 c 0.18267,0.15985 -0.13137,0.088 0,0 z m 35.05236,0.0646 c 0.17034,0.1405 -0.20141,0.0402 0,0 z m 4.07195,1.10337 0.0117,0.0295 z m 0.1982,0.15714 c 0.29637,0.0448 0.1961,0.0297 0,0 z m -38.75147,3.03014 c 0.73033,0.59234 -0.73827,0.47323 0,0 z m -8.38242,3.11359 c 0.46154,0.43882 -0.36864,0.17176 0,0 z m 37.64269,1.30594 c 0.74614,1.33541 -1.56794,0.57833 0,0 z m -23.68992,0.56902 c -2.14598,-0.69719 -2.13064,2.78306 -0.50025,1.13267 0.65351,-0.54866 2.11767,-0.19377 0.50025,-1.13267 z m -14.3061,0.28837 c 0.5789,0.73176 -0.7514602,0.32099 0,0 z m 13.64352,0.38394 -0.0727,0.0736 z m 25.41954,0.33515 c -1.0221,0.73858 -0.19319,3.25683 0.66176,1.11197 1.69348,1.35585 -0.002,-1.32042 -0.66176,-1.11197 z m -39.67581,0.23689 c 0.79394,0.78166 -0.4794902,0.53808 0,0 z m 12.07376,0.0697 c -2.12079,1.9393 1.93732,1.37492 0,0 z m 23.1068,0.48152 c 0.98278,0.005 -0.56509,0.54342 0,0 z m -26.14602,0.49398 c 1.01542,0.66619 -0.62512,0.57422 0,0 z m 31.26782,1.53273 c 0.78133,0.0329 -0.4158,0.2764 0,0 z m -1.80092,0.17263 c 0.56813,-0.0751 -0.35913,0.59452 0,0 z m 1.43985,0.0875 c 0.95489,0.69366 -1.18951,-0.0165 0,0 z m -16.36847,0.283 c -0.87529,1.76484 2.13556,0.38772 0,0 z m -20.2745,0.14469 c 0.1998,0.70731 -0.80606,0.0145 0,0 z m 33.79691,0.9792 c -2.30243,2.74416 5.72249,2.40846 2.12904,0.932 -0.75632,-0.104 -1.74593,-0.13562 -2.12904,-0.932 z m 11.75781,0.1383 c -1.90376,-0.18928 -3.98357,2.69352 -1.36193,3.04451 1.43262,-0.5786 4.75542,-3.16474 1.36193,-3.04451 z m -58.52122024,4.24455 c -1.17762,1.58456 2.05368004,0.25499 0,0 z" + id="path2166" /> diff --git a/artwork/continent_north_america.svg b/artwork/continent_north_america.svg index 05e7cdec3..051716c53 100644 --- a/artwork/continent_north_america.svg +++ b/artwork/continent_north_america.svg @@ -2,11 +2,11 @@ + version="1.1" + width="64.000008" + height="42.321232"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.02325428" + d="m 60.29006,0 c -3.30568,0.0569 -6.62057,0.42416 -9.87425,0.94362 -1.4706,0.36403 0.52285,2.31382 -1.07392,1.81302 1.90407,-0.98918 -5.47015,-1.69457 -3.1008,-0.11651 1.61449,-0.16611 2.68195,0.10622 0.38792,0.25695 -1.48613,0.31305 -1.91041,-0.96196 -2.85485,0.48054 -1.36325,-0.67183 -2.43082,0.26522 -3.52229,-0.82926 -1.21866,-0.15451 -5.32219,1.074 -2.1852,1.22876 2.20579,1.32765 4.88551,-0.29761 7.22892,0.14971 -0.217,0.39732 -4.31068,1.31069 -1.48823,2.11296 1.46681,0.49136 -3.82028,1.68442 -2.03085,-0.75417 1.92513,-1.67259 -1.9779,0.12388 -2.87409,-0.47107 -1.80876,-1.33105 -5.41369,-0.82429 -6.10588,1.07574 0.70107,0.46962 3.49373,-0.68018 1.62533,0.9713 -2.58082,-0.25124 -4.99704,-0.76615 -7.58979,-0.0866 -1.61052,0.0561 -4.53516,-0.39044 -6.86795,-0.93924 -2.56174,0.0711 -5.05111,0.85882 -7.45923,1.62247 0.97511,2.39372 -2.96236,-0.007 -3.11614,2.18063 1.1311,0.51867 2.28665,0.39802 0.41742,0.67536 -1.58321,0.40083 -3.66536,1.48918 -4.46616,2.32973 0.77528,0.12373 2.66638,-0.22586 1.11275,0.83851 1.19799,-0.004 2.60988,0.0879 0.68383,0.69787 C 4.81217,15.13526 2.29127,15.57714 0,16.56789 c 1.00318,0.3772 4.51498,-0.89426 6.22611,-1.34255 0.78706,-0.22784 3.81761,-1.63384 1.88561,-0.0922 2.64036,-0.71385 4.77286,-2.83156 7.68387,-2.5233 3.11931,-0.67228 2.76138,3.02349 1.47715,4.45708 0.63972,1.47116 1.43888,-2.34071 1.50837,0.0855 -0.13119,1.04597 -0.9286,1.99791 0.0872,3.04731 -0.82981,2.36181 -3.6398,4.0428 -3.16031,6.86351 -0.12755,1.34312 1.0065,3.77584 1.53013,3.17411 -0.16206,1.33821 1.10886,3.09851 0.22422,3.31464 1.1023,0.81769 1.22081,3.92949 2.6667,2.90502 -0.42778,-1.18666 -1.75067,-5.00972 -0.0754,-2.20783 2.02779,1.67088 1.10717,4.90037 3.38491,6.23554 1.79337,1.00559 4.54005,1.50147 5.95375,1.76322 1.16557,-0.97599 0.62272,-2.17682 2.6642,-2.01984 1.31509,-1.11885 1.00838,-3.62443 -1.2032,-2.28682 -0.70676,3.49986 -5.34084,1.29536 -3.77727,-1.54645 0.0613,-2.86195 2.80988,-4.81707 5.41892,-3.37452 0.33951,-1.82855 4.4671,-0.85297 3.43212,1.36117 0.91452,2.66486 2.31098,-0.41101 1.34182,-1.76918 0.27307,-3.11446 4.82189,-2.79574 5.08819,-6.04363 0.9837,-1.91743 3.7594,-1.20596 3.91756,-3.44196 0.80409,-0.35141 2.52311,-1.02791 2.37571,0.56676 0.29125,-1.66733 5.27986,-1.44983 3.40367,-2.853 -2.13148,0.78213 -1.23671,-0.89589 -1.74557,-1.77062 -1.80514,0.27696 1.03256,-0.67208 1.22356,0.52606 0.83488,-0.46038 -0.12138,-0.91513 1.35834,-0.7357 1.10041,-0.47641 2.43254,-0.9758 0.8718,0.34353 -1.99691,0.97188 0.51761,2.87699 1.66955,1.70835 1.32781,0.87443 1.59769,-2.03838 0.24693,-2.31539 1.12187,-1.73555 0.29295,-3.01657 -1.08087,-3.79891 0.47777,-1.5251 -0.67506,-3.79464 -2.12353,-1.60882 -1.73688,0.29171 0.19608,-1.87249 -1.48893,-2.10886 -1.1155,-0.40539 -2.82772,0.0189 -0.97648,-1.01625 1.62439,0.002 1.72355,1.58975 3.85832,1.5501 0.87941,0.15351 -0.46407,-1.1001 1.08929,-0.50225 0.34512,-0.51584 0.82698,-0.70018 0.46712,-1.62133 1.4361,0.54713 3.40669,-1.54939 1.03337,-1.88539 -0.66872,-0.0338 0.4358,-1.70395 -1.22699,-1.84315 -1.69298,-1.58801 -3.91,-1.30166 -6.14708,-1.32598 3.17046,0.498 5.70401,-1.36518 8.527,-2.34499 C 59.66154,1.35195 62.01083,1.19382 64.00001,0.41334 62.92384,-0.12269 61.49132,0.08614 60.29007,0 Z m -0.35152,0.1514 0.0323,0.0107 z m 0.0611,0.002 c 0.16141,0.004 -0.0853,0.11177 0,0 z m -1.1714,0.0222 0.008,0.0212 z m 0.36238,0.0222 c 0.43309,0.0623 -0.31393,0.18696 0,0 z m -1.15526,0.53139 c 0.32184,0.30301 -0.57638,0.0552 0,0 z m -5.66607,0.0792 c 0.81999,0.17347 0.25259,0.52865 0,0 z m 4.35956,0.0446 c 0.27829,-0.024 -0.11962,0.22122 0,0 z m 5.47188,0 c 0.10661,0.0761 -0.13762,0.004 0,0 z M 48.78928,1.22788 c -1.82266,0.4685 1.33332,0.61559 0,0 z m -5.07444,0.66288 c -1.64207,-0.5483 -2.30878,1.80821 -0.33095,0.71142 0.45626,-0.003 1.36071,-0.66474 0.33095,-0.71142 z m 1.83789,0.2299 0.003,0.002 z m 2.24717,0.17049 -0.017,0.0216 z m 5.37265,0.0969 -0.003,0.0589 z m -2.01728,0.0438 c 0.76183,0.57728 -0.97963,0.0499 0,0 z m 3.40688,0.0754 c 0.15524,0.13188 -0.24652,0.0305 0,0 z m -2.37619,0.22579 c 0.17157,0.0491 -0.17018,0.0672 0,0 z m -1.10112,0.0918 c 0.2906,-0.0226 -0.17125,0.15079 0,0 z m -3.24923,0.0224 -0.01,0.0785 z m -0.57368,0.16571 c 1.13288,0.27514 -0.70113,0.98925 0,0 z m -0.98675,0.17757 c 0.5619,-0.002 -0.29474,0.36721 0,0 z m 6.35874,0.14861 -0.0487,0.006 z m -2.28421,1.5e-4 c 1.45543,-0.25959 1.68371,0.5004 0,0 z m 0.11504,0.0318 10e-4,0.0166 z m -1.86636,0.0509 c -0.72887,0.42196 0.56206,1.40209 -0.93393,0.81987 0.57836,-0.007 0.22888,-1.145 0.93393,-0.81987 z m -6.76637,0.007 c 0.27161,0.17929 -0.36252,0.0164 0,0 z m 11.78881,0.038 -0.0813,0.0173 z M 41.73097,3.59403 c 0.26009,-0.0261 0.0758,0.23767 0,0 z m -0.42211,0.048 -0.0453,0.014 z m 3.48916,0.017 c -0.0905,0.2005 -0.33978,-0.17011 0,0 z m 1.54941,0.3767 c 0.15955,1.07761 -1.3383,0.5431 0,0 z m 0.64362,0.1728 0.0401,0.0239 z m 1.65654,0.4621 c -1.54448,0.24982 -1.82157,1.89271 -0.73495,2.433 -2.09853,1.0993 -2.34966,-2.6739 0.0592,-2.11151 L 48.3481,4.86103 Z m -5.17121,0.32305 0.0196,0.004 z m 2.06631,0.0984 c -0.12436,0.44371 -0.68096,0.57016 0,0 z m 4.02813,0.0792 -0.0428,0.0743 z m -9.03049,0.13906 c 0.35704,0.17462 -0.41416,0.18839 0,0 z m -1.72418,0.0523 0.0489,0.10993 z m 3.63168,0.74582 c -1.08646,0.66458 1.61143,0.44333 0,0 z m -21.2085,0.0839 -0.0207,0.0163 z m -4.46867,0.16835 c 0.55502,0.16594 -0.56235,0.29365 0,0 z m 0.58915,0.0642 c 0.11385,0.10633 -0.13327,0.0534 0,0 z m 12.71516,0.006 -0.0156,0.0409 z m 11.068,0.0535 c 0.35821,0.11783 -0.33205,0.24041 0,0 z m -11.97082,0.0354 c 0.38629,0.0957 -0.29067,0.2585 0,0 z m 22.76976,0.0591 0.003,0.0681 z m -22.98402,0.006 c 0.21763,0.32145 -0.49438,0.0557 0,0 z m -13.55495,0.0634 c 0.47708,0.2094 -0.508,0.26069 0,0 z m 36.55197,0.0163 0.001,0.0184 z m -1.94914,0.19781 c 0.61492,0.64252 0.38997,1.24363 1.46751,0.26048 -1.73834,2.48496 0.89464,0.54275 1.01108,1.15417 -1.83863,1.06223 -3.77291,1.11606 -4.65994,3.38192 -0.82024,0.75762 -0.36901,0.7309 -1.11744,1.8046 0.97262,1.91472 -3.98145,2.64665 -2.50566,3.64577 -1.95099,2.24935 -0.61827,-1.42696 -0.49643,-1.76585 -2.00939,0.3507 -6.11874,-2.33154 -2.68694,-3.68655 0.76826,-0.54341 4.88973,-2.05104 3.99249,-1.57707 -1.16185,0.7692 2.62836,1.72187 1.53149,0.54741 -1.40366,-0.26772 3.05097,0.11454 0.96217,-1.18546 0.22598,-1.06303 2.31421,-1.12361 2.50167,-2.57942 z m -1.74837,0.0609 0.038,0.10285 z m -4.13262,0.0619 c 0.24079,0.0881 -0.33039,0.14685 0,0 z m -13.59774,0.0374 c 0.43913,0.15615 -0.48414,0.19966 0,0 z m 13.61567,0.0257 -0.003,6.2e-4 z m 0.69596,0.0327 c 0.54917,0.10923 -0.40186,0.17841 0,0 z m 7.59776,0.0173 -0.0148,0.006 z m -5.76875,0.0324 c 0.14759,-0.0622 -0.004,0.1259 0,0 z m 5.93711,0.0109 0.0145,0.13066 z m -8.68737,0.003 -0.0881,0.0511 z m -8.26903,0.0709 c -0.0416,0.49864 -0.58319,-0.3304 0,0 z m 5.63085,0.006 c 1.56333,1.00891 -3.60332,0.0621 -0.37707,0.29086 l 0.20861,-0.0901 z m 2.56462,0.1779 c -0.15927,0.36046 -0.90392,-0.0339 0,0 z m 12.1525,0.0657 0.009,0.007 z m -12.3123,0.0541 -0.001,4.7e-4 z m -8.16716,0.0267 c 1.73335,0.0917 -1.25605,0.59481 0,0 z m 11.25281,0.14252 c -0.005,0.67394 -0.79458,0.0694 0,0 z m -3.57688,0.1881 c 0.11073,0.11421 -0.2182,0.0208 0,0 z m -4.6808,0.0846 0.01,0.005 z m 8.3681,0.23336 c 0.52245,0.0174 -0.25298,0.31534 0,0 z m -14.81652,0.0125 0.0229,0.0854 z m 15.87486,0.081 c 0.45014,0.32266 -0.36218,0.31747 0,0 z m -35.05869,0.24421 -0.01,0.0752 z m 40.43166,0.0632 c 0.20566,0.0903 -0.0436,0.28538 0,0 z m -22.33118,0.0709 c 0.98498,0.39701 -0.7174,0.36694 0,0 z M 9.13521,8.68271 c -1.10072,0.23549 0.59259,0.5603 0,0 z m 37.50564,0.10088 0.009,0.0278 z m -36.36239,0.0601 c 0.36964,0.25618 -0.55738,0.13776 0,0 z m 21.42195,0.0416 c -0.0656,0.25271 -0.40002,-0.28089 0,0 z m 23.27037,0.0392 c 0.8431,0.52258 -0.51775,0.55095 0,0 z m -42.69348,0.063 c 0.32478,-0.15014 -0.0899,0.29151 0,0 z m 19.13659,0.0333 c 0.16911,0.033 -0.14253,0.10866 0,0 z m 25.15484,0.0548 8.2e-4,0.007 z m -46.27249,0.0204 c 0.3915,0.23451 -0.54182,0.17296 0,0 z m 19.55788,0.2146 c -0.051,0.14324 -0.32862,-0.0652 0,0 z m 22.5522,0.87385 0.003,0.0115 z m -45.50923,0.0892 c -1.6934,0.60836 0.12483,1.1007 0.43177,0.146 z m -0.0192,0.17214 0.001,0.0104 z m 47.32013,0.11256 0.0105,0.0303 z m -6.52742,0.32815 c -1.74434,0.52138 0.91011,1.05855 0.006,10e-4 z m -13.78205,0.11421 -0.003,0.0331 z m -0.0838,0.0607 c 0.12295,0.0953 -0.17469,0.0464 0,0 z m -0.0752,0.0953 c 0.11588,0.0873 -0.18701,0.027 0,0 z m -2.39759,0.0193 c 1.57849,0.40444 -1.91873,1.13282 0,0 z m 1.64535,0.0553 c -0.24412,0.14525 -0.16364,0.0974 0,0 z m -0.66008,0.0821 c 0.16387,-0.0163 -0.15056,0.0807 0,0 z m 0.0415,0.11783 c 0.17301,-0.0356 -0.0792,0.16652 0,0 z m -0.19024,0.01 c 0.26408,0.0741 -0.34143,0.13461 0,0 z m -17.15981,0.29096 c 0.0977,0.0798 -0.15612,0.0449 0,0 z m -7.7383,0.14614 0.008,4.6e-4 z m 45.1141,0.14186 c -1.89942,0.77703 0.9222,0.66462 0,0 z m -45.48257,0.0135 c 0.21913,0.16836 0.12476,0.0959 0,0 z m 39.72467,0.37538 c -1.24728,0.31198 0.15728,0.94313 0,0 z m -34.41818,0.2796 c -0.58306,0.56868 -1.62718,0.53326 0,0 z m -1.12811,0.41636 c 0.12555,-0.0234 -0.0801,0.17449 0,0 z m -0.29441,0.21887 c 0.0906,0.0944 -0.19003,0.0262 0,0 z m -2.27005,0.21016 c 0.45047,0.0142 -0.22039,0.55423 0,0 z m 37.35934,0.0214 c -1.5321,0.66253 -0.45421,2.87995 -0.10047,0.64958 l 0.0923,-0.19266 z m -27.25719,0.30001 -0.005,0.0415 z M 5.66996,14.75631 c 0.14542,0.19243 -0.29648,0.10335 0,0 z m 0.17131,0.0191 c 0.13237,0.11933 -0.23106,0.0197 0,0 z m 2.45486,0.0862 c -1.06779,-0.034 -0.7867,1.18273 0,0 z m -2.60445,0.028 c 0.315,0.2477 -0.39546,0.12921 0,0 z m -1.45741,0.29902 c 0.53027,0.30928 -0.66711,0.23983 0,0 z m 16.13866,0.063 -0.0173,0.0231 z m 34.60563,0.4682 0.029,0.12935 z m -50.51241,0.0135 -0.002,0.004 z m 14.48788,0.0877 -0.29797,0.46956 z m -0.38542,0.15601 c 0.23813,-0.0258 -0.21138,0.1396 0,0 z m -16.44459,0.0629 -0.0157,0.0284 z m 42.64246,0.22003 c -0.13751,0.41334 -0.10123,0.30429 0,0 z m -9.89694,0.24422 c 0.3013,0.98458 -0.50773,0.76357 -0.23758,0.15132 l 0.0947,-0.10657 z m -14.93765,0.009 -0.009,0.022 z m 34.5946,0.12919 c 0.0831,0.13971 -0.21837,-0.0328 0,0 z m -34.59987,0.0214 c 0.38206,-0.0242 -0.21985,0.16197 0,0 z m 35.46747,1.85583 c 0.20588,0.32128 -0.49169,0.15768 0,0 z m -36.62997,0.0922 0.0188,0.007 z m 36.57731,0.66107 c 0.46554,0.16276 -0.11438,0.27965 0,0 z m -1.38451,0.0273 0.01,0.0563 z m 2.45437,0.0258 -0.008,0.0182 z m -2.3938,0.0372 c 0.17305,0.12107 -0.14633,0.08 0,0 z m -0.0481,0.0132 0.005,0.002 z m 1.33399,0.0472 0.0107,0.0328 z m -7.17483,0.27582 c 0.31955,0.0331 -0.48215,0.13019 0,0 z m -9.5046,0.0895 c 1.56491,1.28965 -0.57454,1.07696 -1.03834,0.725 -2.30983,0.47276 0.12716,-0.20297 0.76845,-0.64868 z m 13.46707,0.41833 c -1.78944,0.15812 -0.58569,1.34613 0,0 z m -33.22195,0.28833 c 0.47484,0.11432 -0.35769,0.2842 0,0 z m 31.28005,0.0252 c 0.17706,0.39267 -0.43793,0.21999 0,0 z m -30.83473,0.13971 c 0.30179,0.10259 -0.19371,0.17253 0,0 z m 32.0415,0.62684 c -0.14552,0.31307 -0.29524,0.0278 0,0 z M 40.8963,21.64327 c 0.68674,0.27136 -0.58208,0.42833 0,0 z m -2.46984,0.006 c -0.70844,0.81346 -2.537,3.64217 -1.17415,1.02337 0.31246,-0.41453 0.66842,-0.83897 1.17415,-1.02337 z m 1.14359,0.003 c 1.82381,0.027 -0.66432,2.4389 0.22016,0.3008 0.0929,-0.12525 -0.41941,-0.21083 -0.22016,-0.3008 z m 0.63802,0.16934 c 0.19874,-0.0647 -0.007,0.24471 0,0 z m 0.90908,0.13017 c 0.33739,0.36561 -0.52176,0.40199 0,0 z m 7.69996,0.16918 c -0.44964,0.68623 -0.52963,-0.0239 0,0 z m 3.42597,0.47313 c -0.99957,-0.14412 -0.93507,0.90642 0,0 z m -9.90188,0.34329 c 1.32877,0.19145 -1.84845,0.0948 0,0 z m -25.50602,0.54883 c 0.21566,0.38188 -0.43227,0.0579 0,0 z m 23.28979,0.33588 c 0.1803,0.69755 -1.94945,0.35069 0,0 z m -1.10787,0.4315 c 0.10758,0.23288 -0.44526,-0.19762 0,0 z m 3.9753,1.66575 -0.006,0.008 z m -0.0242,0.0303 -0.004,0.005 z m -1.39652,0.17774 -0.0143,0.0374 z m 0.53847,0.24257 c 0.31145,-0.0455 0.0165,0.24441 0,0 z m -25.45073,3.06672 c 0.92862,0.21263 -0.43016,0.35564 0,0 z m 30.14009,0.41586 c -2.25337,1.98068 2.49284,1.06285 0,0 z m -7.80414,0.039 0.0766,0.0484 z M 18.6372,31.15557 c 1.72471,1.15196 -0.70306,2.36609 0,0 z m 15.70963,0.46079 c 0.32962,0.1551 -0.30534,0.10667 0,0 z m -1.48868,0.003 c 0.62306,0.2656 -0.36824,0.43411 0,0 z m 0.9122,0.0123 c 0.36731,0.0759 -0.21554,0.14026 0,0 z m 0.6586,0.10203 c 0.25346,0.12605 -0.16639,0.10525 0,0 z m -1.09355,0.0665 0.0207,0.0379 z m -0.17691,0.0546 0.004,0.005 z m 1.02904,0.10747 0.0217,10e-4 z m -17.7822,0.28305 c -1.04053,0.32232 -0.27668,1.35061 0,0 z m 12.62119,0.70254 -0.005,10e-4 z m -1.72697,0.94693 -0.0527,0.0304 z m 11.44996,0.1407 c -2.11028,-0.10193 2.0152,1.66602 -0.074,1.8899 0.42952,-1.82576 -1.87889,0.96111 0.31601,0.95367 1.64409,0.7161 1.50454,0.37798 1.3586,-0.54665 -0.20985,-0.29645 -0.95042,-1.31114 -1.60056,-2.29692 z m -18.6391,0.99926 c -0.26809,0.0333 0.12457,0.14229 0,0 z m 6.76932,0.58207 0.005,0.04 z m -7.15013,0.0267 6.2e-4,0.0332 z m 19.84489,0.1705 c 0.35923,0.3419 -0.20754,0.20293 0,0 z m -19.94923,0.12934 c 0.3764,0.30501 -0.17468,0.19153 0,0 z M 36.56339,36.546 c -1.29925,-0.59605 -3.72456,1.55478 -1.39558,1.33068 1.02458,-1.95871 2.9603,2.48203 4.90418,1.0049 0.0953,-1.03028 -2.5605,-1.90201 -3.5086,-2.33558 z m -9.86353,0.13182 c 0.45558,0.16668 -0.3295,0.39091 0,0 z m 14.9778,0.11108 c -1.00701,0.30107 -1.76155,2.31215 -0.0707,1.23541 1.14022,-0.0806 0.85815,-0.84893 0.0707,-1.23541 z m -3.8991,0.55591 c 0.62914,0.0342 -0.28645,0.48712 0,0 z m -2.74598,0.15239 -0.0209,0.009 z m -13.69055,0.0339 c -0.31584,0.62404 0.7771,0.13427 0,0 z m 19.82153,0.11833 0.006,0.0288 z m -9.35914,0.15025 c 0.43704,0.0613 -0.31618,0.1901 0,0 z m 6.13344,0.69612 c 0.83707,-0.36315 -0.0983,0.64278 0,0 z M 26.65543,38.521 c 0.1191,0.15546 -0.15489,0.0355 0,0 z m 9.33757,0.10006 c -2.25329,1.98067 2.49303,1.06276 0,0 z m 4.98624,0.0252 c -0.63468,1.00785 -1.84452,1.5501 0.11406,1.81026 1.54623,-0.0415 3.57908,-0.67433 1.02001,-1.72028 -0.36079,-0.37644 -0.76402,0.064 -1.13407,-0.09 z m 4.96287,0.0118 c -3.00101,0.43205 -1.84211,2.59523 0.29382,3.24467 1.30605,1.14716 2.7913,-0.36306 1.09277,-0.96808 2.25042,-0.70358 -0.69977,-1.82503 -1.38659,-2.27659 z m -7.76694,0.79816 c -2.55856,1.20414 2.75478,1.57918 0,0 z m 2.80423,0.18991 v 0.0186 z m -13.71507,0.029 c 0.39469,0.0937 -0.28047,0.15363 0,0 z m 13.71376,0.009 c 0.30015,0.24218 -0.31327,0.18787 0,0 z m -13.0336,0.0987 c 0.32633,0.15429 -0.29748,0.14243 0,0 z m -0.51016,0.017 c 0.12646,0.0712 -0.18177,-0.0248 0,0 z m 0.61663,0.28354 c 0.6058,0.12401 -0.56318,0.3728 0,0 z m -0.84538,1.39834 c 0.2123,-0.0366 -0.10541,0.14402 0,0 z m 1.4533,0.3451 c 0.22428,0.0211 -0.096,0.19571 0,0 z" + id="path2614" /> diff --git a/artwork/continent_oceania.svg b/artwork/continent_oceania.svg index f8b169eb1..45101f85a 100644 --- a/artwork/continent_oceania.svg +++ b/artwork/continent_oceania.svg @@ -2,11 +2,11 @@ + version="1.1" + width="63.999989" + height="63.396488"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.07290012" + d="M 25.569303,2.5684738e-4 C 21.955033,1.1018168 26.618013,2.5496968 26.883113,2.7426668 c -1.93425,-0.53036 -1.93983,1.36145 -0.49763,1.64433 0.13884,-1.54698 1.25818,0.62477 1.7851,0.45383 1.56878,0.46964 4.71961,2.10925 3.80224,3.462 0.71635,0.72374 0.0605,1.9002202 1.81094,2.0597202 1.03597,1.68655 4.24178,0.69291 2.73498,-0.35289 1.73281,-0.1954502 0.88859,-1.5680802 3.0784,-0.5569702 1.1996,1.6447602 3.30866,4.1155802 5.34638,3.0341202 -1.65777,-1.22494 -4.22347,-3.8935902 -2.93039,-5.1212002 -2.2486,-1.41097 -3.57284,-3.79138 -6.4793,-4.25305 -2.42142,-1.45826 -5.33725,-1.92548 -6.94646,0.57468 -2.05498,-0.82717 -0.11513,-3.71856995 -3.01807,-3.68697995262 z M 47.382513,4.8161368 c -1.09738,0.86334 -1.78464,2.08022 -2.91255,1.51583 -3.75628,0.78909 2.89786,1.89626 2.90899,-0.70913 0.30395,-0.19397 0.23293,-0.60801 0.004,-0.8067 z m -11.43917,8.2617102 c -2.12287,2.35876 -0.88581,6.29991 -3.23627,8.44795 -2.31795,0.11903 -7.23232,-3.61022 -3.58762,-5.55001 0.78986,-2.27116 -3.71063,-0.57036 -4.8788,-2.38387 1.70552,2.11629 -3.15008,1.00602 -3.00584,3.7422 0.23905,1.49828 -2.4104,2.05464 -2.21465,0.38147 -1.24181,-1.66015 -3.23785,0.78847 -3.84346,2.22761 -0.0802,0.45069 -1.56268,-0.16697 -1.07619,1.26491 -2.06443,-1.5939 -2.17412,4.03524 -5.21917,3.64551 -2.50702,0.42115 -5.58238,1.93614 -6.85392,3.15105 -0.77621,1.41989 -0.11885,5.24064 -0.90765,4.38082 -0.57924004,0.8472 0.8741,5.14388 0.13931,7.77989 -0.45105004,1.4877 -2.6583,2.97791 0.11514,3.5883 2.39345,-0.71114 4.71933,-1.72352 7.42041,-1.56621 2.96785,-1.90891 7.05001,-3.40848 10.44509,-2.30347 2.94671,-0.20716 0.32812,5.51402 3.3692,2.62583 1.11031,-1.13064 2.82387,-2.60972 1.36266,-0.29755 -0.99694,0.81169 -2.02502,2.74921 -0.30404,0.87186 1.184,-0.45713 -1.204,2.48111 0.81298,1.17732 -1.34583,2.95811 2.10195,5.30908 4.40813,3.22583 -0.60522,1.04979 0.82546,-0.10805 0.64471,1.16821 2.56225,-1.30975 5.54002,-1.45851 6.82182,-4.47646 1.89408,-2.43015 4.81199,-4.1011 6.14369,-7.06714 1.48976,-2.82632 1.79018,-6.17648 -0.28675,-8.70493 -0.73406,-0.35128 -1.26356,-2.21083 -1.60966,-3.46227 -3.95947,-1.08284 -0.53959,-6.56233 -3.84235,-7.57223 -0.28633,-1.46765 -0.13981,-2.94861 -0.81677,-4.29462 z m -6.76849,1.50066 0.0396,-0.0303 z m -6.80158,-0.74445 c -1.02655,0.82934 0.8015,1.00636 0,0 z m 26.41828,0.0217 c -0.74284,0.0182 0.40465,0.24171 0,0 z m -1.01283,0.0545 c -0.0624,0.5859 0.933,0.0155 0,0 z m 7.49744,0.16468 c 0.0792,0.39557 0.92127,0.3181 0,0 z m -26.19013,10e-4 -0.29422,0.21995 z m 33.62908,0.0969 c -0.23309,0.194 0.46784,0.0953 0,0 z m -36.98361,0.0186 c -0.18984,0.1587 0.14085,0.0432 0,0 z m -0.99176,0.0421 c -0.0678,0.28286 0.25555,-0.0869 0,0 z m 4.13643,0.42995 c -0.21956,0.23454 -0.11273,0.12042 0,0 z m 34.18997,2.18259 c -0.41396,0.31722 0.27409,0.42193 0,0 z m -0.022,0.56306 c -0.5711,0.0441 0.26097,0.45681 0,0 z m -1.20721,0.69183 c -0.53445,1.92717 1.28867,1.0768 0,0 z m 1.63903,0.33152 c -0.58124,1.05569 0.31458,0.40666 0,0 z m -0.19965,0.39807 c -0.5054,-0.0657 -0.17876,0.63146 0,0 z m 0.13681,0.25228 c -0.73854,0.10582 -2.65497,1.69555 -0.44965,2.02787 1.21495,-0.20349 0.37058,-1.30641 0.44965,-2.02787 z m -1.10941,0.18944 c -0.37421,0.018 0.21204,0.33233 0,0 z m 0.84354,2.39927 c -0.82922,0.15386 0.41536,0.59752 0,0 z m -24.54492,0.88561 c -0.29616,0.37106 0.32635,0.41345 0,0 z m 24.97952,0.49124 c -0.62169,0.57297 0.66673,0.57296 0,0 z m -10.13103,0.68533 c -0.11889,0.30961 -0.0783,0.20399 0,0 z m 10.21336,0.1882 c -0.49424,0.23238 0.37216,0.60654 0,0 z m -6.09892,0.97661 c 0.33521,3.28153 4.19278,3.10796 1.57731,0.53387 -0.72703,0.18159 -1.14894,0.047 -1.57731,-0.53387 z m 6.36297,0.0765 c -0.28357,0.14487 0.25772,0.0818 0,0 z m -22.8121,0.007 c -0.33798,0.37045 0.19618,0.19085 0,0 z m 19.20035,0.37764 c -0.58392,0.56164 0.0419,0.27511 0,0 z m 0.49372,0.30861 c -0.51136,0.52939 0.80467,0.9151 0,0 z m 0.66985,0.83794 c -0.65197,0.62758 0.77763,0.28554 0,0 z m -0.88777,1.51335 c -0.23391,0.1876 0.27567,0.0681 0,0 z m -0.64911,4.7908 c -3.32328,2.34017 3.28768,2.02875 0,0 z m 0.78594,10.13878 c -0.40375,2.37167 0.47497,4.22536 -2.45741,6.06024 -0.63217,0.20836 0.95564,1.72641 -0.81535,2.27978 -0.0705,1.62191 3.16686,-1.63568 4.23099,-2.33358 1.39198,-0.42501 3.28801,-2.71104 0.52448,-1.55521 -0.99174,-0.30323 0.0406,-2.71787 -1.06645,-0.94935 -0.0711,-1.33793 0.28507,-2.6195 -0.41626,-3.50188 z m -38.16638,1.56784 c -3.04931,0.51184 1.81721,0.60884 0,0 z m 39.47418,0.50548 c -0.34787,0.32289 0.0965,0.39353 0,0 z m -0.74506,0.87168 c -0.44581,-0.0969 -0.0423,0.25802 0,0 z m -34.35527,3.5873 c -0.91217,0.47311 -0.0224,1.13953 0,0 z m 3.93399,0.19192 c -0.94806,0.9053 0.8207,0.70179 0,0 z m -0.0867,0.71287 c -0.93636,0.23677 0.58594,0.31648 0,0 z m -0.12322,0.22163 c -0.21026,-0.0435 -0.096,0.384 0,0 z m 25.1829,0.009 c -2.69689,1.79328 -5.23022,3.8704 -8.379,4.83266 -1.82562,0.62213 -4.16346,2.961 -0.70601,2.66913 2.38159,-1.15176 4.58319,-2.90739 6.97873,-4.22121 1.17799,-0.66693 4.61439,-3.47038 1.73421,-2.3343 l 0.19772,-0.63747 z m -28.88904,0.19255 c -1.0271,1.4574 -1.12125,4.96429 1.21838,2.80658 0.91025,0.21774 3.4464,-3.72063 0.4885,-2.2562 -0.70774,0.24914 -1.29623,-0.0274 -1.70688,-0.55038 z m 29.89784,0.0291 c -0.4912,0.1707 -0.23668,0.47 0,0 z m 6.69015,3.80831 c -1.026,0.64088 0.6553,0.13726 0,0 z m -0.0987,0.62126 -0.11515,0.10493 z m -17.88168,1.46692 -0.0601,0.088 z m -0.53398,1.56133 c -1.31735,0.20459 -0.70171,1.70941 0,0 z m -5.47117,4.75583 c -1.28339,0.22201 -0.1222,0.64887 0,0 z" + id="path2562" /> diff --git a/artwork/continent_south_america.svg b/artwork/continent_south_america.svg index 5f30a5867..55a9bd4c4 100644 --- a/artwork/continent_south_america.svg +++ b/artwork/continent_south_america.svg @@ -2,11 +2,11 @@ + version="1.1" + width="64" + height="105.43111"> + style="fill:#e0e0e0;fill-rule:evenodd;stroke:none;stroke-width:0.08928182" + d="m 14.014699,0 c -3.25731,1.40689 -6.0828799,3.30349 -8.1790099,5.88119 -1.94342,3.44769 1.12826,8.83336 -3.46398,11.39521 -1.87987997,2.18195 -2.59143997,5.60883 -1.75603997,7.64544 -2.48493003,4.18893 3.29131997,7.01121 4.25405997,10.85052 2.00418,3.9798 3.3705,8.46356 8.1808499,9.90797 4.05991,1.75623 4.27486,6.48619 3.9947,10.26784 0.70632,3.89388 -0.12871,7.97629 0.68182,11.79775 1.99506,3.72278 -0.65254,7.71789 0.78915,11.35577 1.1683,4.09812 1.03366,7.73173 2.35067,11.03257 -1.1023,2.06518 2.49252,1.6775 0.52852,3.95353 1.99657,3.44258 3.95029,7.17563 7.58218,9.023 2.7925,0.87328 8.03282,4.03203 9.28725,1.09891 2.12761,0.10423 3.87861,-1.34796 0.56596,-1.1087 -3.97602,-0.36731 -8.70067,-5.11722 -5.50154,-8.96422 2.10612,-1.69178 -5.14325,-3.90943 -0.86654,-5.3151 -0.80003,-2.2305 2.79572,-4.54841 -1.18369,-5.06564 -0.0211,-1.84547 4.03901,0.73947 3.0008,-2.57628 0.98284,-2.09325 7.21259,-1.4268 4.76302,-6.0624 -2.95545,-3.58209 2.64921,0.4977 3.68861,-2.87446 2.32258,-3.97638 5.90478,-8.0807 4.8512,-13.05156 1.64406,-3.07409 6.33558,-3.23435 8.35734,-4.13745 1.31548,-3.28116 3.18693,-7.11986 2.58723,-10.99158 -0.6881,-5.14053 4.57566,-8.0116 5.47209,-12.53188 0.0647,-4.41551 -4.68442,-6.24442 -7.96889,-7.75688 -2.59436,-0.55703 -5.38585,-0.35961 -6.32523,-3.00009 -1.88707,-0.2026 -3.98093,-1.05909 -5.68988,-1.21992 -1.78508,-1.5631 -1.24433,-6.42499 -3.69105,-6.90199 -0.26274,2.90657 -4.04656,4.2333 -3.02605,0.35886 1.67802,-5.17021 -5.09843,-1.31728 -6.18171,-5.59596 -2.59588,-1.31575 -2.28993,-3.10403 -2.2876,-5.53885 -2.91749,0.50161 -4.74674,0.096 -6.92628,1.54005 -2.75435,0.51024 -5.769,-4.65232 -7.38194,-1.33941 C 12.137489,3.07796 17.049229,0.03356 14.014699,0 Z m 8.42668,2.19272 c -2.04708,0.73128 1.36259,1.32244 0,0 z m -11.13271,0.185 c 0.91281,0.54865 -1.02777,0.31335 0,0 z m 3.81301,0.41626 0.0315,0.0273 z m -1.33747,1.121 c 1.3302,1.65586 -1.13252,1.22952 0,0 z M 2.6253391,18.15102 c -0.57137,0.097 -1.03183,0.17514 0,0 z m 44.1847199,2.76555 c 0.41126,-0.3398 0.26169,0.51747 0,0 z m 1.35718,1.4186 c 0.81777,0.66216 -1.06558,0.43891 0,0 z m 1.76283,0.90984 0.0425,0.15733 z m 8.37133,15.99128 -0.0801,0.058 z m 0.005,0.0849 0.002,0.0356 z m -0.26651,1.58768 -0.14823,0.127 z m -41.2353,2.51496 c 0.59784,0.42987 -1.35102,0.3122 0,0 z m 34.5578,12.47701 c 0.58728,-0.0948 -0.0228,0.29143 0,0 z m -8.12188,14.38654 c 0.29937,0.42717 -0.48095,0.0812 0,0 z m -24.73754,4.37636 c 0.39381,0.051 -0.26958,0.44882 0,0 z m 10.96666,7.85005 c 0.48133,0.0137 -0.28351,0.32197 0,0 z m 1.43717,1.79581 c 1.00857,0.15119 -0.61692,0.44172 0,0 z m -9.38391,2.00999 c 1.11037,0.78382 -1.03193,0.92976 0,0 z m 1.93987,6.43982 c 0.15888,0.2324 -0.3158,0.12941 0,0 z m 0.13572,0.1558 0.0218,0.008 z m 9.31795,0.0285 c 0.25265,0.33962 -0.32601,0.11412 0,0 z m -0.62211,1.01599 c 0.85802,0.18786 -0.26961,0.7253 0,0 z m -1.16498,2.63627 0.0358,0.23842 z m 11.08039,0.73658 c -4.44282,3.11263 5.49609,4.01954 3.20765,1.05142 -0.91076,-0.45418 -2.60965,-0.26674 -3.20765,-1.05142 z m -16,2.81295 c 0.60575,0.0407 -0.40623,0.25784 0,0 z m -0.51406,0.0993 c 0.37214,-0.0207 -0.20785,0.1762 0,0 z m 9.01846,1.47206 c 1.67805,0.35055 -1.0625,1.1137 0,0 z" + id="pe" /> From 969ac57b02495588321b2ba0b039bf3c8f3bded8 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Thu, 1 Mar 2018 21:38:17 -0600 Subject: [PATCH 8/9] add subRegions right away to parentRegions, fix AndroidLiveTest --- .../PickTransportNetworkActivityTest.kt | 28 ++++++++- .../grobox/transportr/networks/Continent.java | 18 +++++- .../grobox/transportr/networks/Country.java | 21 ++++++- .../PickTransportNetworkActivity.java | 62 +------------------ .../de/grobox/transportr/networks/Region.java | 7 +++ .../transportr/networks/TransportNetwork.java | 7 ++- .../networks/TransportNetworkBuilder.java | 4 +- 7 files changed, 79 insertions(+), 68 deletions(-) diff --git a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt index 062b0aa14..f2372da69 100644 --- a/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt +++ b/app/src/androidTest/java/de/grobox/transportr/networks/PickTransportNetworkActivityTest.kt @@ -24,8 +24,7 @@ import android.support.test.InstrumentationRegistry import android.support.test.espresso.Espresso.onView import android.support.test.espresso.action.ViewActions.click import android.support.test.espresso.assertion.ViewAssertions.matches -import android.support.test.espresso.contrib.RecyclerViewActions.actionOnItem -import android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition +import android.support.test.espresso.contrib.RecyclerViewActions.* import android.support.test.espresso.matcher.ViewMatchers.* import android.support.test.filters.LargeTest import android.support.test.rule.ActivityTestRule @@ -34,12 +33,14 @@ import android.support.v7.widget.RecyclerView import de.grobox.transportr.R import de.grobox.transportr.ScreengrabTest import de.grobox.transportr.map.MapActivity +import de.grobox.transportr.networks.TransportNetwork import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import java.util.* import javax.inject.Inject +import de.schildbach.pte.NetworkId @LargeTest @@ -73,10 +74,33 @@ class PickTransportNetworkActivityTest : ScreengrabTest() { .check(matches(withText(R.string.pick_network_first_run))) makeScreenshot("1_FirstStart") + // some hacking to find network position in list + val context = InstrumentationRegistry.getTargetContext() + + val continentList = ArrayList(EnumSet.allOf(Continent::class.java)) + Collections.sort(continentList) { r1, r2 -> r1.getName(context).compareTo(r2.getName(context)) } + + val countryList = Continent.EUROPE.getSubRegions() + Collections.sort(countryList) { r1, r2 -> r1.getName(context).compareTo(r2.getName(context)) } + + val networkList = Country.GERMANY.getSubRegions() + // select DB network provider + val continentIndex = continentList.indexOf(Continent.EUROPE) + val countryIndex = countryList.indexOf(Country.GERMANY) + var networkIndex = -1 + for (network in networkList) { + networkIndex++ + if ((network as TransportNetwork).getId() == NetworkId.DB) { + break + } + } onView(withId(R.id.list)) + .perform(scrollToPosition(continentIndex + 5)) .perform(actionOnItem(withChild(withText(R.string.np_continent_europe)), click())) + .perform(scrollToPosition(continentIndex + countryIndex + 5)) .perform(actionOnItem(withChild(withText(R.string.np_region_germany)), click())) + .perform(scrollToPosition(continentIndex + countryIndex + networkIndex + 5)) .perform(actionOnItem(withChild(withText(R.string.np_name_db)), click())) } diff --git a/app/src/main/java/de/grobox/transportr/networks/Continent.java b/app/src/main/java/de/grobox/transportr/networks/Continent.java index 4222c1568..d98dd58d7 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Continent.java +++ b/app/src/main/java/de/grobox/transportr/networks/Continent.java @@ -24,12 +24,15 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.ParametersAreNonnullByDefault; import de.grobox.transportr.R; @ParametersAreNonnullByDefault -enum Continent implements Region { +enum Continent implements ParentRegion { EUROPE(R.string.np_continent_europe, R.drawable.continent_europe), AFRICA(R.string.np_continent_africa, R.drawable.continent_africa), @@ -42,12 +45,15 @@ enum Continent implements Region { private final @StringRes int name; private final @DrawableRes int contour; + private List subRegions; Continent(@StringRes int name, @DrawableRes int contour) { this.name = name; this.contour = contour; + this.subRegions = new ArrayList<>(); } + @Override @StringRes public int getName() { return name; @@ -63,4 +69,14 @@ public String getName(Context context) { return context.getString(name); } + @Override + public void addSubRegion(Region subRegion) { + subRegions.add(subRegion); + } + + @Override + public List getSubRegions() { + return subRegions; + } + } diff --git a/app/src/main/java/de/grobox/transportr/networks/Country.java b/app/src/main/java/de/grobox/transportr/networks/Country.java index 8afad7e09..f7136ad22 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Country.java +++ b/app/src/main/java/de/grobox/transportr/networks/Country.java @@ -23,12 +23,15 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.ParametersAreNonnullByDefault; import de.grobox.transportr.R; @ParametersAreNonnullByDefault -enum Country implements Region { +enum Country implements ParentRegion { GERMANY(R.string.np_region_germany, "🇩🇪", Continent.EUROPE), AUSTRIA(R.string.np_region_austria, "🇦🇹", Continent.EUROPE), @@ -53,13 +56,17 @@ enum Country implements Region { private final @StringRes int name; private final @Nullable String flag; private final Continent continent; + private List subRegions; Country(@StringRes int name, @Nullable String flag, Continent continent) { this.name = name; this.flag = flag; this.continent = continent; + this.continent.addSubRegion(this); + this.subRegions = new ArrayList<>(); } + @Override @StringRes public int getName() { return name; @@ -74,9 +81,19 @@ public String getName(Context context) { public String getFlag() { return flag; } - + public Continent getContinent() { return continent; } + @Override + public void addSubRegion(Region subRegion) { + subRegions.add(subRegion); + } + + @Override + public List getSubRegions() { + return subRegions; + } + } diff --git a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java index 8eea90711..f094256d9 100644 --- a/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java +++ b/app/src/main/java/de/grobox/transportr/networks/PickTransportNetworkActivity.java @@ -90,23 +90,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { list.setLayoutManager(new LinearLayoutManager(this)); list.setAdapter(adapter); - Map> regions = getRegionsByRegion(); List continentItems = new ArrayList<>(Continent.values().length); for (Continent continent : Continent.values()) { - if (!regions.containsKey(continent)) { - continue; - } ContinentItem continentItem = new ContinentItem(continent); - List subRegions = regions.get(continent); + List subRegions = continent.getSubRegions(); List subRegionItems = new ArrayList<>(subRegions.size()); for (Region subRegion : subRegions) { if (subRegion instanceof Country) { Country country = (Country)subRegion; - if (!regions.containsKey(country)) { - continue; - } CountryItem countryItem = new CountryItem(country); - List networks = regions.get(country); + List networks = country.getSubRegions(); List networkItems = new ArrayList<>(networks.size()); for (Region network : networks) { if (!(network instanceof TransportNetwork)) @@ -124,8 +117,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { Collections.sort(subRegionItems, new RegionItem.RegionComparator(this)); continentItem.withSubItems(subRegionItems); continentItems.add(continentItem); - } + Collections.sort(continentItems, new RegionItem.RegionComparator(this)); for (ContinentItem c : continentItems) { adapter.add(c); @@ -192,53 +185,4 @@ private void selectItem() { } } } - - private HashMap> getRegionsByRegion() { - - HashMap> regions = new HashMap<>(); - for (TransportNetwork n : TransportNetworks.networks) { - Region region = n.getRegion(); - Country country; - Continent continent; - if (region instanceof Country) { - country = (Country)region; - continent = country.getContinent(); - - List countries = new ArrayList<>(); - List networks = new ArrayList<>(); - - if (regions.containsKey(continent)) - countries = regions.get(continent); - if (!countries.contains(country)) - countries.add(country); - if (!regions.containsKey(continent)) - regions.put(continent, countries); - - if (regions.containsKey(country)) { - networks = regions.get(country); - } - networks.add(n); - if (!regions.containsKey(country)) { - regions.put(country, networks); - } - - } else if (region instanceof Continent) { - continent = (Continent)region; - - List networks = new ArrayList<>(); - - if (regions.containsKey(continent)) { - networks = regions.get(continent); - } - networks.add(n); - if (!regions.containsKey(continent)) { - regions.put(continent, networks); - } - } else { - continue; - } - } - return regions; - } - } diff --git a/app/src/main/java/de/grobox/transportr/networks/Region.java b/app/src/main/java/de/grobox/transportr/networks/Region.java index 29561a008..ffe265b4b 100644 --- a/app/src/main/java/de/grobox/transportr/networks/Region.java +++ b/app/src/main/java/de/grobox/transportr/networks/Region.java @@ -21,6 +21,13 @@ import android.content.Context; +import java.util.List; + interface Region { String getName(Context context); } +interface ParentRegion extends Region { + int getName(); + void addSubRegion(Region region); + List getSubRegions(); +} diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java index 23f619d2b..1356a6002 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetwork.java @@ -24,6 +24,8 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; +import java.util.List; + import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; @@ -37,7 +39,7 @@ public class TransportNetwork implements Region { private final NetworkId id; - private final Region region; + private final ParentRegion region; private final @StringRes int name; private final @StringRes int description; private final @StringRes int agencies; @@ -47,7 +49,7 @@ public class TransportNetwork implements Region { public enum Status {ALPHA, BETA, STABLE} - TransportNetwork(NetworkId id, Region region, int name, int description, int agencies, Status status, int logo, boolean goodLineNames) { + TransportNetwork(NetworkId id, ParentRegion region, int name, int description, int agencies, Status status, int logo, boolean goodLineNames) { checkArgument(description != 0 || agencies != 0); this.id = id; this.region = region; @@ -57,6 +59,7 @@ public enum Status {ALPHA, BETA, STABLE} this.status = status; this.logo = logo; this.goodLineNames = goodLineNames; + this.region.addSubRegion(this); } public NetworkId getId() { diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkBuilder.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkBuilder.java index 48ce796b7..4edb36aa5 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworkBuilder.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworkBuilder.java @@ -35,7 +35,7 @@ class TransportNetworkBuilder { private NetworkId id; - private Region region; + private ParentRegion region; private @StringRes int name; private @StringRes int description; private @StringRes int agencies; @@ -58,7 +58,7 @@ TransportNetworkBuilder setId(NetworkId id) { return this; } - TransportNetworkBuilder setRegion(Region region) { + TransportNetworkBuilder setRegion(ParentRegion region) { this.region = region; return this; } From 3f8d44dcc5220bffc1970a6aaecee3755b63fea2 Mon Sep 17 00:00:00 2001 From: Ialokim Date: Mon, 5 Mar 2018 09:47:55 -0600 Subject: [PATCH 9/9] make the Nicaraguan provider work again --- .../java/de/grobox/transportr/networks/TransportNetworks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java index 5bc3acdfd..5efc2b37b 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java @@ -649,7 +649,7 @@ public interface TransportNetworks { .setId(NetworkId.NICARAGUA) .setName(R.string.np_name_nicaragua) .setDescription(R.string.np_desc_nicaragua) - .setRegion(Region.CENTRAL_AMERICA) + .setRegion(Continent.CENTRAL_AMERICA) .setLogo(R.drawable.network_nicaragua_logo) .setStatus(ALPHA) .setGoodLineNames(true)