Add support for Navitia fr-se region (South-East of France)

Fixes #277
grote · Dec 17, 2016 · b98e938 · b98e938
1 parent ef3dcf9
commit b98e938
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 1 deletion.
diff --git a/res/drawable/network_francesoutheast_logo.xml b/res/drawable/network_francesoutheast_logo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportHeight="64"
+        android:viewportWidth="64">
+
+    <path
+        android:fillColor="#ed2939"
+        android:pathData="M42.66,0 L64,0 L64,64 L42.66,64 Z"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M21.33,0 L42.66,0 L42.66,64 L21.33,64 Z"/>
+    <path
+        android:fillColor="#002395"
+        android:pathData="M0,0 L21.33,0 L21.33,64 L0,64 Z"/>
+    <path
+        android:fillColor="#ffb300"
+        android:pathData="M47.903,35.123 C55.0827,35.123,60.903,40.9433,60.903,48.123
+C60.903,55.3027,55.0827,61.123,47.903,61.123
+C40.7233,61.123,34.903,55.3027,34.903,48.123
+C34.903,40.9433,40.7233,35.123,47.903,35.123 Z"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#654700"
+        android:pathData="M47.9063,61.1264 L47.9063,48.1264 L60.9292,48.1264 A13,13,0,0,1,47.9063,61.1264 Z"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -243,6 +243,9 @@ there are any).</string>
     <string name="np_name_francenorthwest">France North West</string>
     <string name="np_desc_francenorthwest">Bretagne, Pays de la Loire, Centre, Basse Normandie, Haute Normandie</string>
     <string name="np_desc_francenorthwest_networks" translatable="false">LILA, Star, TAN, IRIGO, SNCF</string>
+    <string name="np_name_frenchsoutheast">France South East</string>
+    <string name="np_desc_frenchsoutheast">Provence-Alpes-Côtes d\'Azur, Rhône-Alpes, Languedoc-Roussillon, Auvergne, Corse</string>
+    <string name="np_desc_frenchsoutheast_networks" translatable="false">MTM, Aix en Bus, Transisère, Ligne d\'Azur, SNCF</string>
     <string name="np_name_frenchsouthwest">France South West</string>
     <string name="np_desc_frenchsouthwest">Poitou-Charentes, Limousin, Aquitaine, Midi-Pyrénées, Bordeaux, Toulouse</string>
     <string name="np_desc_frenchsouthwest_networks" translatable="false">SNCF, TransGironde, TBC, Tisséo</string>

diff --git a/src/de/grobox/liberario/NetworkProviderFactory.java b/src/de/grobox/liberario/NetworkProviderFactory.java
@@ -97,6 +97,7 @@ public final class NetworkProviderFactory
 	private static Reference<FranceSouthWestProvider> franceSouthWestProviderRef;
 	private static Reference<FranceNorthEastProvider> franceNorthEastProviderRef;
 	private static Reference<FranceNorthWestProvider> franceNorthWestProviderRef;
+	private static Reference<FranceSouthEastProvider> franceSouthEastProviderRef;
 	private static Reference<OntarioProvider> ontarioProviderRef;
 	private static Reference<QuebecProvider> quebecProviderRef;
 	private static Reference<RtaChicagoProvider> rtaChicagoProviderRef;
@@ -1018,6 +1019,19 @@ else if (networkId.equals(NetworkId.FRANCENORTHWEST))
 			franceNorthWestProviderRef = new SoftReference<>(provider);
 			return provider;
 		}
+		else if (networkId.equals(NetworkId.FRANCESOUTHEAST))
+		{
+			if (franceSouthEastProviderRef != null)
+			{
+				final FranceSouthEastProvider provider = franceSouthEastProviderRef.get();
+				if (provider != null)
+					return provider;
+			}
+
+			final FranceSouthEastProvider provider = new FranceSouthEastProvider(NAVITIA);
+			franceSouthEastProviderRef = new SoftReference<>(provider);
+			return provider;
+		}
 		else if (networkId.equals(NetworkId.ONTARIO))
 		{
 			if (ontarioProviderRef != null)

diff --git a/src/de/grobox/liberario/TransportNetworks.java b/src/de/grobox/liberario/TransportNetworks.java
@@ -490,7 +490,6 @@ private List<TransportNetwork> populateNetworks() {
 				.setStatus(BETA)
 				.setGoodLineNames(true)
 		);
-
 		list.add(new TransportNetwork(context, NetworkId.FRANCENORTHEAST)
 				.setName(getString(R.string.np_name_francenortheast))
 				.setDescription(getString(R.string.np_desc_francenortheast), getString(R.string.np_desc_francenortheast_networks))
@@ -506,6 +505,13 @@ private List<TransportNetwork> populateNetworks() {
 				.setStatus(ALPHA)
 		);
 
+		list.add(new TransportNetwork(context, NetworkId.FRANCESOUTHEAST)
+				.setName(getString(R.string.np_name_frenchsoutheast))
+				.setDescription(getString(R.string.np_desc_frenchsoutheast), getString(R.string.np_desc_frenchsoutheast_networks))
+				.setRegion(region)
+				.setStatus(BETA)
+				.setGoodLineNames(true)
+		);
 		// New Zealand
 		region = region(R.string.np_region_nz, "\uD83C\uDDF3\uD83C\uDDFF");