Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tile-web/src/main/java/cn/com/taiji/web/controller/TileWebController.java

tile-service/src/main/java/cn/com/taiji/tile/service/ITileService.java

@@ -13,16 +13,6 @@ public interface ITileService {
 
 
     byte[] tileData(GeoRequestParam requestParam, List<LayerGroupDsView> layerGroupDsViewList, Map<String,List<LayerStyleView>> dataMaps);
-
-    /**
-     * 查询要素信息
-     * @param bbox
-     * @param type
-     * @param layerName
-     * @return
-     */
-    List<?> queryElements(String bbox, Integer type, String layerName);
-
     FeatureInfo getFeatureInfo(GeoRequestParam geoRequestParam, List<LayerGroupDsView> layerGroupDsViewList, Map<String, List<LayerStyleView>> dataMaps);
 
 }

tile-service/src/main/java/cn/com/taiji/tile/service/impl/TileServiceImpl.java

@@ -256,12 +256,6 @@ public class TileServiceImpl implements ITileService {
         return featureInfo;
     }
 
-
-
-    @Override
-    public List<?> queryElements(String bbox, Integer type, String layerName) {
-        return null;
-    }
     public static double[] parseBbox(String bboxString) {
         String[] bboxValuesStr = bboxString.split(",");
         if (bboxValuesStr.length != 4) {