Add support for Nicaragua providers

grote · Dec 5, 2017 · baab572 · baab572
1 parent a512319
commit baab572
Show file tree

Hide file tree

Showing 8 changed files with 691 additions and 2 deletions.
diff --git a/app/src/main/java/de/grobox/transportr/networks/NetworkProviderFactory.java b/app/src/main/java/de/grobox/transportr/networks/NetworkProviderFactory.java
@@ -103,6 +103,8 @@ public final class NetworkProviderFactory {
 	private static Reference<CostaRicaProvider> costaRicaProviderRef;
 	private static Reference<GhanaProvider> ghanaProviderRef;
 	private static Reference<NewyorkProvider> newYorkProviderRef;
+	private static Reference<ManaguaProvider> managuaProviderRef;
+	private static Reference<EsteliProvider> esteliProviderRef;
 
 	private static final String NAVITIA = "87a37b95-913a-4cb4-ba52-eb0bc0b304ca";
 	private static final String VAO = "{\"aid\":\"hf7mcf9bv3nv8g5f\",\"pw\":\"87a6f8ZbnBih32\",\"type\":\"USER\",\"user\":\"mobile\"}";
@@ -867,6 +869,26 @@ public static synchronized NetworkProvider provider(final NetworkId networkId) {
 			final NewyorkProvider provider = new NewyorkProvider(NAVITIA);
 			newYorkProviderRef = new SoftReference<>(provider);
 			return provider;
+		} else if (networkId.equals(NetworkId.MANAGUA)) {
+			if (managuaProviderRef != null) {
+				final ManaguaProvider provider = managuaProviderRef.get();
+				if (provider != null)
+					return provider;
+			}
+
+			final ManaguaProvider provider = new ManaguaProvider(NAVITIA);
+			managuaProviderRef = new SoftReference<>(provider);
+			return provider;
+		} else if (networkId.equals(NetworkId.ESTELI)) {
+			if (esteliProviderRef != null) {
+				final EsteliProvider provider = esteliProviderRef.get();
+				if (provider != null)
+					return provider;
+			}
+
+			final EsteliProvider provider = new EsteliProvider(NAVITIA);
+			esteliProviderRef = new SoftReference<>(provider);
+			return provider;
 		} else {
 			throw new IllegalArgumentException(networkId.name());
 		}

diff --git a/app/src/main/java/de/grobox/transportr/networks/Region.java b/app/src/main/java/de/grobox/transportr/networks/Region.java
@@ -55,7 +55,8 @@ enum Region {
 	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, "🌍");
+	AFRICA(R.string.np_region_africa, "🌍"),
+	NICARAGUA(R.string.np_region_nicaragua, "🇳🇮");
 
 	private final @StringRes int name;
 	private final @Nullable String flag;

diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.java
@@ -635,6 +635,25 @@ public interface TransportNetworks {
 					.setGoodLineNames(true)
 					.build(),
 
+			// Nicaragua
+
+			new TransportNetworkBuilder()
+					.setId(NetworkId.MANAGUA)
+					.setName(R.string.np_name_managua)
+					.setDescription(R.string.np_desc_managua)
+					.setRegion(Region.NICARAGUA)
+					.setStatus(ALPHA)
+					.setGoodLineNames(true)
+					.build(),
+
+			new TransportNetworkBuilder()
+					.setId(NetworkId.ESTELI)
+					.setName(R.string.np_name_esteli)
+					.setDescription(R.string.np_desc_esteli)
+					.setRegion(Region.NICARAGUA)
+					.setStatus(ALPHA)
+					.setGoodLineNames(true)
+					.build(),
 	};
 
 }
diff --git a/app/src/main/res/drawable/network_niesteli_logo.xml b/app/src/main/res/drawable/network_niesteli_logo.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60.000006dp"
+    android:height="59.999998dp"
+    android:viewportWidth="60.000006"
+    android:viewportHeight="59.999998">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 1.471405e-8 -0.000031586915 H 60.0000040147 V 59.9999724131 H 1.471405e-8 V -0.000031586915 Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 37.745236,59.51391 c -0.802027,-0.67487 -0.806838,-0.62949 0.232588,-2.19397
+1.095559,-1.64896 2.69675,-5.41336 2.611983,-6.14077 -0.0622,-0.53378
+-0.114667,-0.55252 -2.169946,-0.77482 -3.36763,-0.36425 -3.797986,-0.88735
+-3.797986,-4.6165 0,-2.93782 0.598709,-2.68667 -6.798031,-2.85164
+-6.253328,-0.13946 -6.253328,-0.13946 -6.253328,0.57695 0,5.62013
+-3.760099,8.19768 -11.6675912,7.99815 -2.3160081,-0.0584 -2.3160081,-0.0584
+-2.3803061,-0.8353 -0.06188,-0.74775 -0.03858,-0.77833 0.621494,-0.81572
+0.377184,-0.0214 0.9188511,-0.0554 1.2037011,-0.0757 0.284851,-0.0203
+0.9036242,-0.0494 1.3750502,-0.0647 0.855938,-0.0279 0.857955,-0.0299
+1.439359,-1.42627 1.487009,-3.57148 3.668379,-6.09738 5.929177,-6.86565
+1.096725,-0.37268 1.096725,-0.37268 1.152013,-5.68752 0.03041,-2.92316
+0.0043,-5.31484 -0.05812,-5.31484 -0.06238,0 -0.404714,0.33178 -0.76075,0.73728
+-2.77565,3.16131 -7.833743,1.52167 -7.833743,-2.53939 0,-1.36819
+1.33978,-3.17426 2.678204,-3.61031 0.972895,-0.31696 1.017587,-0.41421
+0.894579,-1.94662 -0.206159,-2.56832 1.578591,-4.65655 3.979829,-4.65655
+0.730633,0 1.148295,-0.53397 1.148295,-1.46808 0,-0.44934 0.152589,-1.36583
+0.339088,-2.03663 0.339089,-1.21964 0.339089,-1.21964 -1.133144,-4.25035
+-2.543235,-5.23547 -1.815468,-8.57199 2.185544,-10.01984 4.527105,-1.63823
+7.411679,-0.13968 9.373047,4.86935 1.932625,4.93562 2.067976,5.19422
+3.006478,5.74422 2.954231,1.7313 3.608609,3.23278 3.798234,8.71507
+0.143311,4.14331 0.143311,4.14331 1.997925,4.35047 2.052646,0.22929
+1.678202,-0.0305 3.586646,2.48812 0.469312,0.61936 0.469312,0.61936
+0.34008,0.0497 -0.154615,-0.68159 -0.0059,-0.70161 1.187837,-0.15993
+1.608796,0.73002 1.62776,0.7102 1.630975,-1.70456 0.0034,-2.57818
+0.108312,-3.02369 0.749692,-3.18467 0.80088,-0.20101 1.11196,0.24062
+1.11196,1.57861 0,3.02048 0.201647,3.06127 2.562561,0.51844 1.606025,-1.72977
+1.911207,-1.96807 2.520434,-1.96807 0.994244,0 1.085348,0.36565 0.279127,1.12028
+-0.385507,0.36085 -1.1083,1.11872 -1.606202,1.68418 -0.497904,0.56546
+-1.499145,1.63781 -2.224983,2.38302 -1.319707,1.35491 -1.319707,1.35491
+-1.33622,9.84035 -0.02623,13.47773 0.03697,13.16599 -2.707324,13.35382
+-1.756896,0.12024 -1.610525,-0.0477 -2.795176,3.20621 -0.413858,1.13674
+-1.127655,2.67494 -1.586214,3.41822 -0.458561,0.74329 -1.060678,1.74763
+-1.338037,2.23188 -0.591732,1.03311 -0.653124,1.0473 -1.4888,0.34413 z M
+16.96557,48.61774 c 1.331863,-0.6854 2.059862,-1.89843 2.243393,-3.73805
+0.274816,-2.75464 -2.113592,-1.76728 -4.202417,1.73725 -1.544068,2.59058
+-0.754333,3.39715 1.959024,2.0008 z m 28.359727,-0.44135 c 0.774665,-0.78655
+0.542676,-19.26551 -0.240576,-19.16287 -0.263197,0.0345 -0.65887,-0.10049
+-0.879276,-0.29995 -0.390335,-0.35325 -0.40027,-0.34004 -0.382744,0.50893
+0.04271,2.06917 -3.210563,2.01445 -4.860001,-0.0817 -2.535597,-3.22236
+-2.357383,-3.60429 -2.184472,4.68155 0.156506,7.49953 0.171676,7.57943
+1.440183,7.58499 1.833185,0.008 4.611399,3.2133 5.024523,5.79685
+0.221453,1.38489 1.217789,1.85007 2.082363,0.97224 z m -4.527984,-0.38551 c
+0.223862,-1.93701 -3.176231,-5.45279 -3.923329,-4.05681 -0.418558,0.78208
+-0.08348,3.91238 0.466788,4.36077 0.801551,0.65315 3.372051,0.4271
+3.456541,-0.30396 z m -6.214325,-7.71837 c 0.136873,-2.16234 0.702178,-1.99534
+-6.54328,-1.93299 -6.36561,0.0548 -6.36561,0.0548 -6.429112,1.29198
+-0.09501,1.85102 -0.367693,1.78201 6.788276,1.71792 6.119421,-0.0548
+6.119421,-0.0548 6.184116,-1.07691 z m -1.865304,-4.16333 c -0.114013,-0.50829
+-4.135068,-4.86208 -4.490492,-4.86208 -0.50568,0 -5.139375,4.70765
+-4.884533,4.96249 0.466406,0.46641 9.480512,0.36986 9.375025,-0.10041 z m
+-8.237883,-3.92941 c 2.690647,-2.6937 2.662389,-2.53287 0.777566,-4.42518
+-2.815719,-2.82691 -3.569296,-2.31967 -3.639907,2.45001 -0.07831,5.28941
+-0.297241,5.13833 2.862341,1.97517 z m 10.142074,2.11763 c 0,-0.14538
+0.0099,-1.7535 0.0219,-3.5736 0.04354,-6.58069 0.256077,-6.30528
+-2.696258,-3.49386 -2.560553,2.43834 -2.565089,2.21969 0.104303,5.02519
+2.134896,2.24374 2.570063,2.58954 2.570063,2.04227 z M 16.328374,30.64187 c
+1.233542,-0.75214 1.145592,-2.24428 -0.225824,-3.83123 -0.841054,-0.97323
+-1.757254,-0.92797 -2.799747,0.13833 -1.917494,1.96126 0.675312,5.12595
+3.025571,3.6929 z m 25.704603,-1.28814 c 0.530277,-0.53028 -2.148369,-3.9001
+-3.100162,-3.9001 -0.710117,0 -0.709545,-0.026 -0.02723,1.23736 1.105032,2.04605
+2.530449,3.25968 3.127392,2.66274 z M 29.699752,26.98158 c 1.203536,-1.30668
+2.019187,-2.12472 2.941457,-2.95009 1.28615,-1.15102 1.026139,-1.21391
+-5.373671,-1.29965 -5.59344,-0.0749 -5.59344,-0.0749 -5.659364,0.72923
+-0.08527,1.04013 0.145829,1.24234 1.465618,1.28243 0.597454,0.0181
+1.333609,0.0455 1.635897,0.0608 0.374137,0.0189 0.870209,0.37039
+1.553732,1.10075 0.552265,0.59011 1.209635,1.28929 1.460822,1.55374
+0.650793,0.68515 0.9776,0.60621 1.975509,-0.47722 z M 19.217983,24.06185 c
+0.579546,-2.3091 -0.173092,-4.30419 -1.458506,-3.86621 -2.349535,0.80057
+-2.474186,4.32089 -0.158298,4.47053 1.270926,0.0821 1.462488,0.0105
+1.616804,-0.60432 z M 34.68815,20.60777 c 0.155934,-0.40636 -0.04897,-3.81297
+-0.281717,-4.68374 -1.190896,-4.45534 -8.39149,-5.75038 -11.845121,-2.13035
+-1.788813,1.875 -1.6458,6.80433 0.20164,6.95009 3.055394,0.24107
+11.818854,0.14113 11.925198,-0.136 z M 23.649449,17.38781 c -0.309998,-0.57924
+-0.265456,-0.93908 0.164396,-1.32809 0.985986,-0.89231 2.310358,0.057
+1.691847,1.21266 -0.353527,0.66057 -1.525488,0.73345 -1.856243,0.11543 z m
+6.831372,0.0926 c -0.686805,-0.82755 0.517708,-2.06515 1.551499,-1.59412
+0.656149,0.29896 0.729822,1.35986 0.117201,1.68772 -0.57652,0.30855
+-1.371979,0.26393 -1.6687,-0.0936 z m -8.469551,-5.8352 c 0.156377,-0.18844
+0.866972,-0.60406 1.579098,-0.92358 1.566889,-0.70304 1.617878,-0.13931
+-0.39678,-4.38655 C 21.02274,1.75857 21.142542,1.8832 19.944831,2.95523 c
+-1.438373,1.28743 -1.596464,2.89227 -0.53703,5.4516 1.198383,2.89499
+2.030015,3.92944 2.603469,3.23838 z M 29.787539,9.59147 C 29.925233,9.23264
+29.964839,9.33115 28.332536,5.97231 26.84281,2.90685 25.988216,2.05043
+24.10828,1.73901 23.476516,1.63435 23.227832,1.66411 23.227832,1.84425 c
+0,0.5999 3.385767,7.62786 3.812331,7.91339 0.462102,0.30933 2.614879,0.17911
+2.747376,-0.16617 z" />
+</vector>