Merge pull request #202 from HSLdevcom/next-cleanup

Remove deprecated next-waltti and next-map endpoints

common.conf

@@ -132,20 +132,6 @@ location /realtime/raildigitraffic2gtfsrt/v1/ {
     # proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
 }
 
-location  /map/v1/next- {
-    rewrite /map/v1/next-(.*) /map/v1/$1  break;
-    proxy_pass         http://hsl-map-server-next:8080;
-    # proxy_cache        tiles;
-    # proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
-    # proxy_cache_revalidate on;
-    # proxy_cache_lock   on; 
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    # add_header         X-Cache-Status $upstream_cache_status;
-}
-
 location /map/v1/ {
     proxy_pass         http://hsl-map-server:8080;
     proxy_cache        tiles;
@@ -270,16 +256,6 @@ location /routing/v2/routers/hsl {
     proxy_read_timeout 11500ms;
 }
 
-location /routing/v1/routers/next-waltti {
-    rewrite /routing/v1/routers/next-waltti(.*) /otp/routers/default$1  break;
-    proxy_pass         http://opentripplanner-waltti-alt-v2:8080/;
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    proxy_read_timeout 11500ms;
-}
-
 location /routing-data/v2/hsl {
     rewrite /routing-data/v2/hsl/(.*) /$1  break;
     proxy_pass         http://opentripplanner-data-con-hsl:8080/;
@@ -360,16 +336,6 @@ location /routing-data/v3/finland {
     include            cors.conf;
 }
 
-location /routing-data/v2/next-waltti {
-    rewrite /routing-data/v2/next-waltti/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-waltti-alt-v3:8080/;
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    include            cors.conf;
-}
-
 location /ui/v1/finland/ {
     rewrite /ui/v1/finland/(.*) /$1  break;
     proxy_pass         http://digitransit-ui-matka-v2:8080;

test.js

@@ -119,7 +119,6 @@ describe('api.digitransit.fi', function() {
   testProxying('api.digitransit.fi','/realtime/raildigitraffic2gtfsrt/v1/','raildigitraffic2gtfsrt:8080');
  //testCaching('api.digitransit.fi','/realtime/raildigitraffic2gtfsrt/v1/foo',true);
   testProxying('api.digitransit.fi','/map/v1/','hsl-map-server:8080');
-  testProxying('api.digitransit.fi','/map/v1/next-hsl-map/index.json','hsl-map-server-next:8080');
   testProxying('api.digitransit.fi','/map/v2/','hsl-map-server:8080');
   testProxying('api.digitransit.fi','/routing/v1/routers/finland','opentripplanner-finland:8080');
   testProxying('api.digitransit.fi','/routing/v1/routers/hsl','opentripplanner-hsl:8080');
@@ -128,7 +127,6 @@ describe('api.digitransit.fi', function() {
   testProxying('dev-api.digitransit.fi','/routing/v2/routers/hsl','opentripplanner-hsl-v2:8080');
   testProxying('dev-api.digitransit.fi','/routing/v2/routers/waltti','opentripplanner-waltti-v2:8080');
   testProxying('dev-api.digitransit.fi','/routing/v2/routers/waltti-alt','opentripplanner-waltti-alt-v2:8080');
-  testProxying('dev-api.digitransit.fi','/routing/v1/routers/next-waltti','opentripplanner-waltti-alt-v2:8080');
   testProxying('api.digitransit.fi','/routing-data/v2/hsl/router-hsl.zip','opentripplanner-data-con-hsl:8080');
   testResponseHeader('api.digitransit.fi','/routing-data/v2/hsl/router-config.json', 'access-control-allow-origin', '*');
   testProxying('api.digitransit.fi','/routing-data/v2/waltti/router-waltti.zip','opentripplanner-data-con-waltti:8080');
@@ -143,8 +141,6 @@ describe('api.digitransit.fi', function() {
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/waltti-alt/router-config.json', 'access-control-allow-origin', '*');
   testProxying('dev-api.digitransit.fi','/routing-data/v3/finland/router-finland.zip','opentripplanner-data-con-finland-v3:8080');
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/finland/router-config.json', 'access-control-allow-origin', '*');
-  testProxying('dev-api.digitransit.fi','/routing-data/v2/next-waltti/router-waltti.zip','opentripplanner-data-con-waltti-alt-v3:8080');
-  testResponseHeader('dev-api.digitransit.fi','/routing-data/v2/next-waltti/router-config.json', 'access-control-allow-origin', '*');
   testProxying('api.digitransit.fi','/ui/v1/finland/sw.js','digitransit-ui-matka-v2:8080');
   testProxying('api.digitransit.fi','/ui/v1/hsl-next/sw.js','digitransit-ui-hsl-v2:8080');
   testProxying('api.digitransit.fi','/ui/v1/waltti-next/sw.js','digitransit-ui-waltti-v2:8080');