Merge pull request #23 from IGNF/modifaoc

Modifaoc

controllers/aoc/index.js

@@ -14,60 +14,73 @@ var _ = require('lodash');
 /**
  * Récupération des AOC viticoles par géométrie
  */
-router.get('/appellation-viticole', [
+router.post('/appellation-viticole', [
     check('geom').exists().withMessage('Le paramètre geom est obligatoire'),
     check('geom').custom(isGeometry)
 ], validateParams, pgClient, function(req, res, next) {
     var params = matchedData(req);
 
     var sql = format(`
         SELECT 
-            id,
-            new_insee,
-            new_nomcom,
-            old_insee,
-            old_nomcom,
-            type_ig,
-            id_app,
-            appellation,
-            id_denom,
-            denomination,
-            crinao,
-            ST_AsGeoJSON(geom) as geom 
+        appellation,
+        idapp,
+        id_uni,
+        insee,
+        segment,
+        instruction_obligatoire,
+        granularite,
+        ST_AsGeoJSON(geom) as geom
         FROM 
-            inao.appellation
+            appellations
         WHERE ST_Intersects(
             geom,
             ST_SetSRID(ST_GeomFromGeoJSON('%s'), 4326)
-        )        
+        )    
         LIMIT 1000
     `, params.geom );
-
-    req.pgClient.query(sql,function(err,result){
+
+    var sqlCommunes = format(`
+		SELECT
+        NOM_COM as nom,
+        CODE_INSEE as insee,
+        ST_Contains(input.geom, communes_ign.geom) AS contains,
+        ST_AsGeoJSON(communes_ign.geom) AS geom
+        FROM
+			communes_ign,
+            (SELECT ST_SetSRID(ST_GeomFromGeoJSON('%s'), 4326) geom) input
+        WHERE ST_Intersects(communes_ign.geom, input.geom);
+        `, params.geom);
+
+    req.pgClient.query(sqlCommunes,function(err,result){  
         if (err)
+        return next(err);
+        req.intersectedCommunes = result.rows;    
+		req.pgClient.query(sql,function(err,result){
+			if (err)
             return next(err);
 
-        return res.send({
-            type: 'FeatureCollection',
-            features: result.rows.map(function (row) {
-                const feature = {
-                    type: 'Feature',
-                    geometry: JSON.parse(row.geom),
-                    properties: _.omit(row, 'geom')
-                };
-                /*
-                if (row.granularite === 'commune' && !row.instruction_obligatoire) {
-                    const commune = _.find(req.intersectedCommunes, { insee: row.insee });
-                    feature.properties.area = commune.intersect_area;
-                    feature.properties.contains = commune.contains;
-                    feature.geometry = JSON.parse(commune.geom);
-                }
-                */
-                return feature;
-            })
-        });
-    });
+			return res.send({
+				type: 'FeatureCollection',
+				features: result.rows.map(function (row) {
+					const feature = {
+						type: 'Feature',
+						geometry: JSON.parse(row.geom),
+					properties: _.omit(row, 'geom')
+					};
+					const communetest = _.find(req.intersectedCommunes, { insee: row.insee });
+
+					if (row.granularite === 'commune' && !row.instruction_obligatoire) {
+						const commune = _.find(req.intersectedCommunes, { insee: row.insee });
+						feature.properties.area = commune.intersect_area;
+						feature.properties.contains = commune.contains;
+						feature.geometry = JSON.parse(commune.geom);
+					}
+
+					return feature;
+				})
+			});
+		});
+	});
 });
 
-
 module.exports = router;

doc/aoc.yml

@@ -22,11 +22,12 @@ basePath: /api
 
 paths:
   /aoc/appellation-viticole:
-    get:
+    post:
       description: |
         Prend une geometrie de type GeoJSON en paramètre d'entrée et renvoie les appellations viticoles intersectantes
-
-        Paramètres de sorties : Retourne un résultat de Type "FeatureCollection"
+      consumes:
+        - application/x-www-form-urlencoded
+      Paramètres de sorties : Retourne un résultat de Type "FeatureCollection"
       parameters:
 
         - name: geom
@@ -63,28 +64,28 @@ definitions:
       properties:
         type: object
         properties:
-          id:
+          appelation:
             type: string        
-          id_app:
-            type: string
-          new_insee:
+          idapp:
             type: string
-          new_nomcom:
+          id_uni:
             type: string
-          old_insee:
+            description: corresponds à "segment-idapp-insee"
+          insee:
             type: string
-          old_nomcom:
+          segment:
             type: string
-          type_ig:
+          instruction_obligatoire:
+            type: boolean
+          granularite:
             type: string
+            enum:
+              - commune
+              - exacte
           appellation:
             type: string
-          id_denom:
-            type: string
-          denomination:
-            type: string
-          crinao:
-            type: string
+          contains:
+            type: boolean
       geometry:
         $ref: '#/definitions/MultiPolygon'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apicarto",
-  "version": "2.0.0",
+  "version": "2.1.2",
   "main": "index.js",
   "scripts": {
     "import": "npm run import-inao-appellation",
@@ -16,7 +16,7 @@
     "Vincent Sagniez <[email protected]>",
     "Mickael Borne <[email protected]>"
   ],
-  "repository": "sgmap/apicarto",
+  "repository": "IGNF/apicarto",
   "license": "AGPL-3.0",
   "engines": {
     "node": ">=6"