tjserver

src/store/modules/gis.ts

@@ -794,6 +794,38 @@ const actions = {
     }
   },
   LOAD_GIS_ELEMENT({state, dispatch, getters, rootState}: any, activeArr: any = []) {
+    // const cql: any = ["(geoType = 2)"]
+    // cql.push(`(typeValue in (${getters['elementActiveArr'].length > 0 ? getters['elementActiveArr'].map(v => `'${v.value}'`).join(',') : -1}))`)
+    // const notIds: Array<string> = []
+    // if (state.gisParams.default.feature) {
+    //   notIds.push(`'${state.gisParams.default.feature.getId()}'`)
+    // }
+    // if (state.gisParams.qy.feature) {
+    //   notIds.push(`'${state.gisParams.qy.feature.getId()}'`)
+    // }
+    // if (notIds.length > 0) {
+    //   cql.push(`(dataId not in (${notIds.join(',')}))`)
+    // }
+    // let vp: null | string = null
+    // if (state.gisParams.qy.analysisWKT) {
+    //   vp = `locationValue:${formatWkt(state.gisParams.qy.analysisWKT)}`
+    // }
+    // if (state.analysis.wkt) {
+    //   vp = `locationValue:${formatWkt(state.analysis.wkt)}`
+    // }
+    // const tileWMS = new source.TileWMS({
+    //   url: `/${rootState.app.apiProxy.geoserverApi}/geoserver/mysqlGeo/wms`,
+    //   params: {
+    //     'FORMAT': 'image/png8',
+    //     'VERSION': '1.1.1',
+    //     "exceptions": 'application/vnd.ogc.se_inimage',
+    //     refresh: new Date().getTime(),
+    //     LAYERS: 'mysqlGeo:socialManagementElement',
+    //     viewparams: vp,
+    //     CQL_FILTER: `(${cql.join(' and ')})`
+    //   }
+    // })
+    // state.element.layer.setSource(tileWMS)
     const cql: any = ["(geoType = 2)"]
     cql.push(`(typeValue in (${getters['elementActiveArr'].length > 0 ? getters['elementActiveArr'].map(v => `'${v.value}'`).join(',') : -1}))`)
     const notIds: Array<string> = []
@@ -814,13 +846,13 @@ const actions = {
       vp = `locationValue:${formatWkt(state.analysis.wkt)}`
     }
     const tileWMS = new source.TileWMS({
-      url: `/${rootState.app.apiProxy.geoserverApi}/geoserver/mysqlGeo/wms`,
+      url: `/${rootState.app.apiProxy.geoserverApi}/queryTile`,
       params: {
         'FORMAT': 'image/png8',
         'VERSION': '1.1.1',
         "exceptions": 'application/vnd.ogc.se_inimage',
         refresh: new Date().getTime(),
-        LAYERS: 'mysqlGeo:socialManagementElement',
+        LAYERS: 'geo_fk_ship',
         viewparams: vp,
         CQL_FILTER: `(${cql.join(' and ')})`
       }