fix:合并冲突问题

ZhangXianQiang

2024-04-11 1e537df7699ddb11f2a08d1116f107b160299ea6

 src/assets/map/zigong1.json

@@ -13724,7 +13724,7 @@
    {
      "type": "Feature",
      "geometry": {
        "type": "Polygon",
        "type": "MultiPolygon",
        "coordinates": [
          [
            [
@@ -15232,35 +15232,7 @@
              29.3673757219045,
              0
            ]
          ]
        ]
      },
      "properties": {
        "name": "自流井",
        "styleUrl": "#msn_ylw-pushpin",
        "fill-opacity": 0.7019607843137254,
        "fill": "#323232",
        "stroke-opacity": 1,
        "stroke": "#686868",
        "stroke-width": 5,
        "icon-scale": 1.1,
        "icon-offset": [
          20,
          2
        ],
        "icon-offset-units": [
          "pixels",
          "pixels"
        ],
        "icon": "http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png",
        "Style": "BRUSH(id:ogr-brush-1);PEN(c:#4d90feff,w:1.000000px,id:ogr-pen-0);LABEL(f:黑体,s:11.000000pt,c:#ffffffff,w:100.000000,o:#000000ff)"
      }
    },
    {
      "type": "Feature",
      "geometry": {
        "type": "Polygon",
        "coordinates": [
          ],
          [
            [
              104.734902857524,
@@ -20511,6 +20483,7 @@
        "Style": "BRUSH(id:ogr-brush-1);PEN(c:#4d90feff,w:1.000000px,id:ogr-pen-0);LABEL(f:黑体,s:11.000000pt,c:#ffffffff,w:100.000000,o:#000000ff)"
      }
    },

    {
      "type": "Feature",
      "geometry": {