~thannema/radkarte/main

« back to all changes in this revision

Viewing changes to modify_add_pois_to_areas.patch

  • Committer: Thilo Hannemann
  • Date: 2010-06-02 20:59:26 UTC
  • Revision ID: thannema@gmx.de-20100602205926-x2v8v6joxp5hxw21
Modified patches to work with the most recent revision of mkgmap (1652).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Index: src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
2
2
===================================================================
3
 
--- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java     (revision 1581)
 
3
--- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java     (revision 1652)
4
4
+++ src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java     (working copy)
5
 
@@ -112,6 +112,7 @@
 
5
@@ -113,6 +116,7 @@
6
6
        private final Rule relationRules;
7
7
 
8
8
        private final boolean ignoreMaxspeeds;
10
10
        private boolean driveOnLeft;
11
11
        private boolean driveOnRight;
12
12
        private final boolean checkRoundabouts;
13
 
@@ -161,6 +162,7 @@
14
 
                nodeRules = style.getNodeRules();
 
13
@@ -164,6 +168,7 @@
15
14
                relationRules = style.getRelationRules();
 
15
 
16
16
                ignoreMaxspeeds = props.getProperty("ignore-maxspeeds") != null;
17
17
+               addPoisToAreas = props.getProperty("add-pois-to-areas") != null;
18
18
                driveOnLeft = props.getProperty("drive-on-left") != null;
19
19
                NODHeader.setDriveOnLeft(driveOnLeft);
20
20
                driveOnRight = props.getProperty("drive-on-right") != null;
21
 
@@ -269,10 +271,13 @@
 
21
@@ -272,10 +285,13 @@
22
22
                        GType foundType = makeGTypeFromTags(way);
23
23
                        if(foundType == null)
24
24
                                return;
33
33
                preConvertRules(way);
34
34
 
35
35
                wayRules.resolveType(way, new TypeResult() {
36
 
@@ -286,21 +291,40 @@
 
36
@@ -289,21 +305,40 @@
37
37
                                        // originalWay.put(el, way);
38
38
                                }
39
39
                                postConvertRules(el, type);
48
48
+       private void addConvertedWay(final Way way, final GType foundType, final Way wayForPoiConversion) {
49
49
                if (foundType.getFeatureKind() == GType.POLYLINE) {
50
50
                    if(foundType.isRoad() &&
51
 
                           !MapElement.hasExtendedType(foundType.getType()))
 
51
                           !MapObject.hasExtendedType(foundType.getType()))
52
52
                                addRoad(way, foundType);
53
53
                    else
54
54
                                addLine(way, foundType);
78
78
        }
79
79
 
80
80
        /**
81
 
@@ -498,19 +522,16 @@
 
81
@@ -500,19 +690,16 @@
82
82
                clipper.clipLine(line, lineAdder);
83
83
        }
84
84