search purchase area in search region

catalog/static/catalog/js/dataRetrieval.js

@@ -13,7 +13,7 @@ var polygonList;
 
 var makeRequest = function (value) {
     var pol_element = document.getElementById('polygon-list');
-    console.log("hola");
+
     // city request to DB
     // variable req_url in map.html
     $.ajax({
@@ -46,10 +46,15 @@ var makeRequest = function (value) {
             } else {
                 data.polygonList.forEach(function (polygon) {
                     var temp = document.querySelector('#city_list_template');
+                    let search_name = polygon.city + ", " + polygon.state;
+
+                    if (!polygon.state) {
+                        search_name = polygon.city;
+                    }
 
                     // filling template
                     temp.content.querySelector('li').id                  = polygon.id;
-                    temp.content.querySelectorAll('span')[0].textContent = polygon.city + ", " + polygon.state;
+                    temp.content.querySelectorAll('span')[0].textContent = search_name;
                     temp.content.querySelectorAll('span')[1].textContent = polygon.description;
                     temp.content.querySelectorAll('div')[3].textContent  = "Fuente: " + polygon.source;
 
@@ -153,26 +158,24 @@ function drawPolygon(element) {
             // clean product panel
             erase_product_list_globe();
 
-            // set input box with polygon city name
-            var input_text = polygon.city + ", " + polygon.state;
-            $("#ajax-input").val(input_text);
-            $('#search_name').val(input_text);
-            $("#area_description").val(polygon.description)
-
             // remove prev polygon
             osmap.removePolygon();
 
-            // draw wkt polygon
-            // osmap.addWKTPolygon(polygon.wkt_polygon);
+            var input_text = polygon.city;
 
-            // format coords to draw
+            if (polygon.geojson.geometry) {
                 var coords = osmap.formatCoords(polygon.geojson.geometry.coordinates);
-
-            // get the biggest area
                 // var biggest = osmap.getBiggestPolygon(coords);
-
-            // draw coordsR
                 osmap.addPolygon(coords);
+                input_text += ", " + polygon.state
+            } else {
+                osmap.addWKTPolygon(polygon.wkt_polygon);
+            }
+
+            // set input box with polygon city name
+            $("#ajax-input").val(input_text);
+            $('#search_name').val(input_text);
+            $("#area_description").val(polygon.description)
         }
     });
 }

catalog/views.py

@@ -199,14 +199,17 @@ class SearchSubmitView(View):
     def post(self, request):
         template = loader.get_template(self.template)
         searchValue = request.POST.get('value', '')
-        searchValue = self.strip_accents(searchValue).lower()
+        searchValue_lower = self.strip_accents(searchValue).lower()
 
         ## A simple query for Polygon objects whose name is 'searchValue'
         ## We exclude those polygons whose E_MUN field are NULL .encode("utf-8")since at this point we're only interested
         ## on polygons that represent cities (Municipios).
-        polygonList = Polygon.objects.filter(name__startswith=searchValue).exclude(E_MUN__isnull=True)
+        polygonList = Polygon.objects.filter(name__startswith=searchValue_lower).exclude(E_MUN__isnull=True)
+        purchased_list = Purchase.objects.values('id', 'name', 'description', 'search__area').filter(user_id=request.user.id, name__startswith=searchValue)
 
         data_list = []
+
+        # append searched polygons from Polygon table
         if len(polygonList) > 0:
             for polygon in polygonList:
                 polygonInfo = json.loads(polygon.json_info)
@@ -221,11 +224,22 @@ class SearchSubmitView(View):
                     'source': polygon.source
                 })
 
-        data = {
-            'polygonList': data_list
-        }
+        # append searched polygons from Purchase table
+        if len(purchased_list) > 0:
+            for purchase in purchased_list:
+                data_list.append({
+                    'id': 'p{}'.format(purchase['id']),
+                    'city': purchase['name'],
+                    'state': '',
+                    'geojson': {},
+                    'wkt_polygon': purchase['search__area'],
+                    'description': purchase['description'],
+                    'source': 'Purchase'
+                })
 
-        return JsonResponse(data)
+        return JsonResponse({
+            'polygonList': data_list
+        })
 
 
 # -------------------------------------------------------------------------------