diff --git a/data/drules_proto.bin b/data/drules_proto.bin index dac666dcb9..83ce395dd8 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 4b85a1da10..11ab6c9ccc 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -12530,7 +12530,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -12542,7 +12542,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12563,7 +12563,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12584,7 +12584,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -12604,7 +12604,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12624,7 +12624,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12644,7 +12644,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12664,7 +12664,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12685,7 +12685,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -35640,7 +35640,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35670,7 +35670,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35707,7 +35707,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35744,7 +35744,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35781,7 +35781,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35818,7 +35818,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35859,7 +35859,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35941,7 +35941,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35971,7 +35971,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36008,7 +36008,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36045,7 +36045,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36082,7 +36082,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36119,7 +36119,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36160,7 +36160,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36242,7 +36242,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -36272,7 +36272,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36309,7 +36309,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36346,7 +36346,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36383,7 +36383,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36420,7 +36420,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36461,7 +36461,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36543,7 +36543,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -36573,7 +36573,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36610,7 +36610,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36647,7 +36647,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36684,7 +36684,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36721,7 +36721,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36762,7 +36762,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -38331,7 +38331,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -38351,7 +38351,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -38371,7 +38371,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -38667,7 +38667,7 @@ cont { priority: -15915 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16085 min_distance: 10 } @@ -38704,7 +38704,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38749,7 +38749,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38798,7 +38798,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -39202,7 +39202,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -39214,7 +39214,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -39235,7 +39235,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -39256,7 +39256,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -39276,7 +39276,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -39296,7 +39296,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -39316,13 +39316,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 } @@ -39336,13 +39336,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 is_optional: true @@ -39357,13 +39357,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 is_optional: true @@ -39409,7 +39409,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39446,7 +39446,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39483,7 +39483,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39520,7 +39520,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39565,7 +39565,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39614,7 +39614,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39694,7 +39694,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39731,7 +39731,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39768,7 +39768,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39805,7 +39805,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39850,7 +39850,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39899,7 +39899,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39979,7 +39979,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -40016,7 +40016,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40053,7 +40053,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40090,7 +40090,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40135,7 +40135,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40184,7 +40184,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40264,7 +40264,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -40301,7 +40301,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40338,7 +40338,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40375,7 +40375,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40420,7 +40420,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40469,7 +40469,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -41350,6 +41350,7 @@ cont { height: 9 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } @@ -41365,6 +41366,7 @@ cont { height: 10 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } @@ -41380,6 +41382,7 @@ cont { height: 10 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a913a5e3ea..28cf7eefbc 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index ec1a45870d..fdaa1b730d 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -12299,7 +12299,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -12311,7 +12311,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12332,7 +12332,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12353,7 +12353,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -12373,7 +12373,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12393,7 +12393,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12413,7 +12413,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12433,7 +12433,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12454,7 +12454,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -35281,7 +35281,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35311,7 +35311,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35348,7 +35348,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35385,7 +35385,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35422,7 +35422,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35459,7 +35459,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35500,7 +35500,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35582,7 +35582,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35612,7 +35612,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35649,7 +35649,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35686,7 +35686,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35723,7 +35723,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35760,7 +35760,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35801,7 +35801,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35883,7 +35883,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35913,7 +35913,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35950,7 +35950,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35987,7 +35987,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36024,7 +36024,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36061,7 +36061,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36102,7 +36102,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36184,7 +36184,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -36214,7 +36214,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36251,7 +36251,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36288,7 +36288,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36325,7 +36325,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36362,7 +36362,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36403,7 +36403,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -37972,7 +37972,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -37992,7 +37992,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -38012,7 +38012,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 4473924 offset_y: 1 is_optional: true @@ -38308,7 +38308,7 @@ cont { priority: -15915 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16085 min_distance: 10 } @@ -38345,7 +38345,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38390,7 +38390,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38439,7 +38439,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38843,7 +38843,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -38855,7 +38855,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -38876,7 +38876,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -38897,7 +38897,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -38917,7 +38917,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -38937,7 +38937,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -38957,13 +38957,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 } @@ -38977,13 +38977,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 is_optional: true @@ -38998,13 +38998,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 4473924 + height: 12 + color: 3832097 stroke_color: 452984831 offset_y: 1 is_optional: true @@ -39050,7 +39050,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39087,7 +39087,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39124,7 +39124,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39161,7 +39161,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39206,7 +39206,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39255,7 +39255,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39335,7 +39335,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39372,7 +39372,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39409,7 +39409,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39446,7 +39446,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39491,7 +39491,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39540,7 +39540,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39620,7 +39620,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39657,7 +39657,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39694,7 +39694,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39731,7 +39731,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39776,7 +39776,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39825,7 +39825,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39905,7 +39905,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39942,7 +39942,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39979,7 +39979,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40016,7 +40016,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40061,7 +40061,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40110,7 +40110,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40991,6 +40991,7 @@ cont { height: 9 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } @@ -41006,6 +41007,7 @@ cont { height: 10 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } @@ -41021,6 +41023,7 @@ cont { height: 10 color: 3355443 stroke_color: 872415231 + offset_y: 1 } priority: 15323 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index f4008acc4e..fd653d9f7b 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index f5d82ff74d..00b247ec82 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -12299,7 +12299,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -12311,7 +12311,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12332,7 +12332,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -12353,7 +12353,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -12373,7 +12373,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12393,7 +12393,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12413,7 +12413,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12433,7 +12433,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -12454,7 +12454,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -35424,7 +35424,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35454,7 +35454,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35491,7 +35491,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35528,7 +35528,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35565,7 +35565,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35602,7 +35602,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35643,7 +35643,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35725,7 +35725,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -35755,7 +35755,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -35792,7 +35792,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35829,7 +35829,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35866,7 +35866,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35903,7 +35903,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -35944,7 +35944,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36026,7 +36026,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -36056,7 +36056,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36093,7 +36093,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36130,7 +36130,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36167,7 +36167,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36204,7 +36204,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36245,7 +36245,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36327,7 +36327,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 12 } @@ -36357,7 +36357,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16076 min_distance: 10 } @@ -36394,7 +36394,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36431,7 +36431,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36468,7 +36468,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36505,7 +36505,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -36546,7 +36546,7 @@ cont { priority: -15924 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16076 min_distance: 10 } @@ -38115,7 +38115,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 5592405 offset_y: 1 is_optional: true @@ -38135,7 +38135,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 5592405 offset_y: 1 is_optional: true @@ -38155,7 +38155,7 @@ cont { } caption { primary { - height: 10 + height: 11 color: 5592405 offset_y: 1 is_optional: true @@ -38451,7 +38451,7 @@ cont { priority: -15915 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16085 min_distance: 10 } @@ -38488,7 +38488,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38533,7 +38533,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38582,7 +38582,7 @@ cont { priority: -15953 } symbol { - name: "garden-m" + name: "garden-outline-m" priority: 16047 min_distance: 10 } @@ -38986,7 +38986,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 20 } @@ -38998,7 +38998,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -39019,7 +39019,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 min_distance: 12 } @@ -39040,7 +39040,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16676 } caption { @@ -39060,7 +39060,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -39080,7 +39080,7 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { @@ -39100,13 +39100,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 5592405 + height: 12 + color: 2836760 stroke_color: 437326080 offset_y: 1 } @@ -39120,13 +39120,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 5592405 + height: 12 + color: 2836760 stroke_color: 437326080 offset_y: 1 is_optional: true @@ -39141,13 +39141,13 @@ cont { priority: -15324 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16676 } caption { primary { - height: 10 - color: 5592405 + height: 12 + color: 2836760 stroke_color: 437326080 offset_y: 1 is_optional: true @@ -39193,7 +39193,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39230,7 +39230,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39267,7 +39267,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39304,7 +39304,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39349,7 +39349,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39398,7 +39398,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39478,7 +39478,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39515,7 +39515,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39552,7 +39552,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39589,7 +39589,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39634,7 +39634,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39683,7 +39683,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39763,7 +39763,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -39800,7 +39800,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39837,7 +39837,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -39874,7 +39874,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39919,7 +39919,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -39968,7 +39968,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40048,7 +40048,7 @@ cont { priority: -15915 } symbol { - name: "park-s" + name: "park-outline-s" priority: 16085 min_distance: 10 } @@ -40085,7 +40085,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40122,7 +40122,7 @@ cont { priority: -15915 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16085 min_distance: 10 } @@ -40159,7 +40159,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40204,7 +40204,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -40253,7 +40253,7 @@ cont { priority: -15953 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16047 min_distance: 10 } @@ -41134,6 +41134,7 @@ cont { height: 9 color: 7829367 stroke_color: 856756480 + offset_y: 1 } priority: 15323 } @@ -41149,6 +41150,7 @@ cont { height: 10 color: 7829367 stroke_color: 856756480 + offset_y: 1 } priority: 15323 } @@ -41164,6 +41166,7 @@ cont { height: 10 color: 7829367 stroke_color: 856756480 + offset_y: 1 } priority: 15323 } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 929f757c6f..49f43a74cc 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 199409d88d..e828d49c2c 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -4984,7 +4984,7 @@ cont { element { scale: 12 symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -5001,7 +5001,7 @@ cont { element { scale: 13 symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -5018,7 +5018,7 @@ cont { element { scale: 14 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5034,7 +5034,7 @@ cont { element { scale: 15 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5050,7 +5050,7 @@ cont { element { scale: 16 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5066,7 +5066,7 @@ cont { element { scale: 17 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5082,7 +5082,7 @@ cont { element { scale: 18 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5098,7 +5098,7 @@ cont { element { scale: 19 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -21155,7 +21155,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21185,7 +21185,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21215,7 +21215,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21245,7 +21245,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21275,7 +21275,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21305,7 +21305,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21335,7 +21335,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21369,7 +21369,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21420,7 +21420,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21450,7 +21450,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21480,7 +21480,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21510,7 +21510,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21540,7 +21540,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21570,7 +21570,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21600,7 +21600,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21634,7 +21634,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21685,7 +21685,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21715,7 +21715,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21745,7 +21745,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21775,7 +21775,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21805,7 +21805,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21835,7 +21835,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21865,7 +21865,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21899,7 +21899,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21950,7 +21950,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21980,7 +21980,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -22010,7 +22010,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22040,7 +22040,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22070,7 +22070,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22100,7 +22100,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22130,7 +22130,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22164,7 +22164,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -23422,7 +23422,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -23443,7 +23443,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -23464,7 +23464,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23484,7 +23484,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23504,7 +23504,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23524,7 +23524,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23544,7 +23544,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23564,7 +23564,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23615,7 +23615,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23645,7 +23645,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23675,7 +23675,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23705,7 +23705,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23735,7 +23735,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23769,7 +23769,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23834,7 +23834,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23864,7 +23864,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23894,7 +23894,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23924,7 +23924,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23954,7 +23954,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23988,7 +23988,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24053,7 +24053,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24083,7 +24083,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24113,7 +24113,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24143,7 +24143,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24173,7 +24173,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24207,7 +24207,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24272,7 +24272,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24302,7 +24302,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24332,7 +24332,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24362,7 +24362,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24392,7 +24392,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24426,7 +24426,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index b00b6faed8..1a731d30ca 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 5831f76df5..7a1528e38d 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -4984,7 +4984,7 @@ cont { element { scale: 12 symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -5001,7 +5001,7 @@ cont { element { scale: 13 symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -5018,7 +5018,7 @@ cont { element { scale: 14 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5034,7 +5034,7 @@ cont { element { scale: 15 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5050,7 +5050,7 @@ cont { element { scale: 16 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5066,7 +5066,7 @@ cont { element { scale: 17 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5082,7 +5082,7 @@ cont { element { scale: 18 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -5098,7 +5098,7 @@ cont { element { scale: 19 symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -21479,7 +21479,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21509,7 +21509,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21539,7 +21539,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21569,7 +21569,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21599,7 +21599,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21629,7 +21629,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21659,7 +21659,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21693,7 +21693,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21744,7 +21744,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21774,7 +21774,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -21804,7 +21804,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21834,7 +21834,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21864,7 +21864,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21894,7 +21894,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21924,7 +21924,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -21958,7 +21958,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22009,7 +22009,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -22039,7 +22039,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -22069,7 +22069,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22099,7 +22099,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22129,7 +22129,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22159,7 +22159,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22189,7 +22189,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22223,7 +22223,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22274,7 +22274,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -22304,7 +22304,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16094 min_distance: 12 } @@ -22334,7 +22334,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22364,7 +22364,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22394,7 +22394,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22424,7 +22424,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22454,7 +22454,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -22488,7 +22488,7 @@ cont { priority: -15906 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16094 min_distance: 10 } @@ -23746,7 +23746,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -23767,7 +23767,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-s" + name: "nparkf-outline-s" priority: 16682 min_distance: 12 } @@ -23788,7 +23788,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23808,7 +23808,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23828,7 +23828,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23848,7 +23848,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23868,7 +23868,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23888,7 +23888,7 @@ cont { priority: -15318 } symbol { - name: "nparkf-m" + name: "nparkf-outline-m" priority: 16682 } caption { @@ -23939,7 +23939,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23969,7 +23969,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -23999,7 +23999,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24029,7 +24029,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24059,7 +24059,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24093,7 +24093,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24158,7 +24158,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24188,7 +24188,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24218,7 +24218,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24248,7 +24248,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24278,7 +24278,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24312,7 +24312,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24377,7 +24377,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24407,7 +24407,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24437,7 +24437,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24467,7 +24467,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24497,7 +24497,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24531,7 +24531,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24596,7 +24596,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24626,7 +24626,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24656,7 +24656,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24686,7 +24686,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24716,7 +24716,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 } @@ -24750,7 +24750,7 @@ cont { priority: -15895 } symbol { - name: "park-m" + name: "park-outline-m" priority: 16105 min_distance: 10 }