X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.maps.server%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fmaps%2Fserver%2FActivator.java;h=a09545fbf6034587aa74e90f17e7c382e886df9d;hb=02ecca5e61d2eb17de40cc058be678b414aaad00;hp=eaeda86acb88b6acf71432b556a3aa81d5d42aed;hpb=1bc60c2213f9b3fc7b4d935ba9afda2b767290e5;p=simantics%2Fdistrict.git

diff --git a/org.simantics.maps.server/src/org/simantics/district/maps/server/Activator.java b/org.simantics.maps.server/src/org/simantics/district/maps/server/Activator.java
index eaeda86a..a09545fb 100644
--- a/org.simantics.maps.server/src/org/simantics/district/maps/server/Activator.java
+++ b/org.simantics.maps.server/src/org/simantics/district/maps/server/Activator.java
@@ -1,6 +1,7 @@
 package org.simantics.district.maps.server;
 
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
@@ -40,15 +41,18 @@ public class Activator implements BundleActivator {
     }
 
     public static Path getNodeJSRoot() throws IOException, URISyntaxException {
-        URL nodeURL = getContext().getBundle().getEntry("/node");
-        URL nodeFileURL = FileLocator.toFileURL(nodeURL);
-        return Paths.get(nodeFileURL.toURI());
+        return resolvePath("/node");
     }
     
     public static Path getTileserverMapnikRoot() throws IOException, URISyntaxException {
-        URL serverURL = getContext().getBundle().getEntry("/server");
-        URL serverFileURL = FileLocator.toFileURL(serverURL);
-        return Paths.get(serverFileURL.toURI());
+        return resolvePath("/server");
+    }
+    
+    private static Path resolvePath(String entry) throws IOException, URISyntaxException {
+        URL entryURL = getContext().getBundle().getEntry(entry);
+        URL entryFileURL = FileLocator.toFileURL(entryURL);
+        URI encodedUri = new URI(entryFileURL.getProtocol(), entryFileURL.getPath(), null).normalize();
+        return Paths.get(encodedUri);
     }
 
 }