Merge branch 'dev-threejs'

ZhangXianQiang

2024-04-19 5dc2118eddbda91c965a14dd57255229cab60da1

 src/assets/map/zigong2.json

@@ -20,6 +20,10 @@
          "pixels",
          "pixels"
        ],
        "center": [
          104.681471408,
          29.41058885
        ],
        "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)"
      },
@@ -568,7 +572,11 @@
        "styleUrl": "#msn_ylw-pushpin0",
        "fill-opacity": "0.5",
        "fill": "#000000",
        "stroke-opacity": "1"
        "stroke-opacity": "1",
        "center": [
          104.805193,
          29.348033
        ]
      },
      "geometry": {
        "coordinates": [
@@ -936,6 +944,10 @@
        "icon-offset-units": [
          "pixels",
          "pixels"
        ],
        "center": [
          104.968050,
          29.285946
        ],
        "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)"
@@ -2027,6 +2039,10 @@
          "pixels",
          "pixels"
        ],
        "center": [
          104.81804,
          29.440594
        ],
        "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)"
      },
@@ -2913,6 +2929,10 @@
          "pixels",
          "pixels"
        ],
        "center": [
          104.599106,
          29.341427
        ],
        "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)"
      },
@@ -3734,6 +3754,10 @@
        "icon-offset-units": [
          "pixels",
          "pixels"
        ],
        "center": [
          104.3334,
          29.2938
        ],
        "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)"
@@ -5281,6 +5305,10 @@
          "pixels",
          "pixels"
        ],
        "center": [
          105.104762,
          29.518852
        ],
        "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)"
      },