Merge branch 'OSMParserV2' of https://github.com/johannes67890/MapOfD…

…enmark into OSMParserV2
johannes67890 · Apr 8, 2024 · e01ae7c · e01ae7c
2 parents 0771f75 + dc485cf
commit e01ae7c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/src/main/java/parser/TagWay.java b/src/main/java/parser/TagWay.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 
 enum Way {
-    ID, REFS, NAME, TYPE
+    ID, REFS, NAME, TYPE, SPEEDLIMIT
 }
 
 /**
@@ -19,12 +19,12 @@ public TagWay(XMLBuilder builder) {
         super(new HashMap<Way, Object>(){
             {
                 put(Way.ID, builder.getId());
+                put(Way.NAME, builder.getName());
                 put(Way.REFS, builder.getWayBuilder().getRefNodes());
+                if(!builder.getType().equals(Type.BUILDING)){
+                put(Way.SPEEDLIMIT, builder.getWayBuilder().getSpeedLimit());
+                }
                 put(Way.TYPE, builder.getType());
-                put(Way.NAME, builder.getName());
-                // if(builder.getType().equals()){
-                //     put(Way.NAME, "No name");
-                // }
             }
         });
     }

diff --git a/src/main/java/parser/XMLBuilder.java b/src/main/java/parser/XMLBuilder.java
@@ -129,17 +129,24 @@ private void parseTag(String k, String v){
                     for (String currVal : currType.getValue()) {
                         if (v.equals(currVal) || currVal.equals("")) {
                             switch (currType) { 
+
+                                // Way types
+                                case PRIMARY_ROAD:
+                                case SECONDARY_ROAD:
+                                case TERTIARY_ROAD:
+                                case OTHER_ROAD:
+                                    parseStreet(currType);
+                                // Relation types
                                 case BOUNDARY:
                                 case ROUTE:
                                 case RESTRICTION:
                                 case MULTIPOLYGON:
-                                    this.type = currType;
                                     this.TypeValue = v;
                                     break;
                                 default:
-                                this.type = currType;
                                 break;
                             }
+                            this.type = currType;
                         }
                     }
                 }
@@ -171,8 +178,25 @@ private void parseTag(String k, String v){
                 }
             }
         }
-        public void parseType(){
 
+        public void parseStreet(Type type){
+            final int DEFAULT_SPEED = 50;
+
+            switch (type) {
+                case MOTORWAY:
+                    wayBuilder.setSpeedLimit(130);
+                    break;
+                case PRIMARY_ROAD:
+                case SECONDARY_ROAD:
+                case TERTIARY_ROAD:
+                    wayBuilder.setSpeedLimit(80);
+                    break;
+                case OTHER_ROAD:
+                    wayBuilder.setSpeedLimit(DEFAULT_SPEED);
+                    break;
+                default:
+                    break;
+            }
         }
     }