Mercurial > hg > ChinaGisRestApi
comparison RestDbGisApi.py @ 276:55bc9972fb1b
Merge with d1b43624cc63b829f64cc952540748e15272e389
author | casties |
---|---|
date | Thu, 23 Feb 2012 21:29:06 +0100 |
parents | eb8a18f94d2d d1b43624cc63 |
children | 4ade9b80b563 |
comparison
equal
deleted
inserted
replaced
275:eb8a18f94d2d | 276:55bc9972fb1b |
---|---|
235 | 235 |
236 | 236 |
237 def getLiveKmlUrl(self,schema,table,useTimestamp=True,REQUEST=None): | 237 def getLiveKmlUrl(self,schema,table,useTimestamp=True,REQUEST=None): |
238 return self.getLiveUrl(schema,table,useTimestamp,REQUEST) | 238 return self.getLiveUrl(schema,table,useTimestamp,REQUEST) |
239 | 239 |
240 def getKmlData(self, schema, table, ids=None, sortBy=1, gisIdField=None, latField=None, lonField=None, geomField="point", colorField="red_big"): | 240 def getKmlData(self, schema, table, ids=None, sortBy=1, gisIdField=None, latField=None, lonField=None, geomField="point", colorField="red_big",from_year_name='from_year',until_year_name=''): |
241 """returns data structure for KML template""" | 241 """returns data structure for KML template""" |
242 logging.debug("getKMLdata gid=%s lat=%s lon=%s sortBy=%s geom=%s color=%s"%(gisIdField,latField,lonField,sortBy,geomField,colorField)) | 242 logging.debug("getKMLdata gid=%s lat=%s lon=%s sortBy=%s geom=%s color=%s"%(gisIdField,latField,lonField,sortBy,geomField,colorField)) |
243 if geomField is None: | 243 if geomField is None: |
244 geomField="point" | 244 geomField="point" |
245 if colorField is None: | 245 if colorField is None: |
409 from_year = '' | 409 from_year = '' |
410 until_year = '' | 410 until_year = '' |
411 sql = "SELECT field_name FROM public.gis_table_meta_rows WHERE table_name = %s and gis_type = %s" | 411 sql = "SELECT field_name FROM public.gis_table_meta_rows WHERE table_name = %s and gis_type = %s" |
412 # from_year and until_year in metadata first | 412 # from_year and until_year in metadata first |
413 try: | 413 try: |
414 res = self.executeSQL(sql, (table,'from_year')) | 414 res = self.executeSQL(sql, (table,from_year_name)) |
415 if len(res['rows']) > 0: | 415 if len(res['rows']) > 0: |
416 from_year = res['rows'][0][0] | 416 from_year = res['rows'][0][0] |
417 except: | 417 except: |
418 from_year = "from_year_dummy" | 418 from_year = "from_year_dummy" |
419 try: | 419 try: |
420 res = self.executeSQL(sql, (table,'until_year')) | 420 res = self.executeSQL(sql, (table,until_year_name)) |
421 if len(res['rows']) > 0: | 421 if len(res['rows']) > 0: |
422 until_year = res['rows'][0][0] | 422 until_year = res['rows'][0][0] |
423 except: | 423 except: |
424 until_year = "until_year_dummy" | 424 until_year = "until_year_dummy" |
425 | 425 |
426 #DW added for testing E4D with names | |
427 from_year=from_year_name | |
428 until_year=until_year_name | |
429 | |
430 logging.debug("from_year:"+from_year) | |
431 logging.debug("until_year:"+until_year) | |
426 for i in range (len(dataset)): | 432 for i in range (len(dataset)): |
427 value = dataset[i] | 433 value = dataset[i] |
428 | 434 |
429 name = data['fields'][i][0] | 435 name = data['fields'][i][0] |
430 #logging.debug("value=%s"%value) | 436 #logging.debug("value=%s"%value) |
436 #elif name.find('place')>-1: | 442 #elif name.find('place')>-1: |
437 # desc += "<name>%s</name>\n"%value | 443 # desc += "<name>%s</name>\n"%value |
438 # continue | 444 # continue |
439 | 445 |
440 val = "%s: %s"%(name, value) | 446 val = "%s: %s"%(name, value) |
447 logging.debug(name) | |
441 value=unicode(value) | 448 value=unicode(value) |
442 if name == from_year: | 449 if name == from_year: |
443 beg_yr= value | 450 beg_yr= value |
444 if name == until_year: | 451 if name == until_year: |
445 end_yr=value | 452 end_yr=value |
703 isLoadReady=self.RESTwrite2File(self.daten,kmlFileName,kml4Marker) | 710 isLoadReady=self.RESTwrite2File(self.daten,kmlFileName,kml4Marker) |
704 | 711 |
705 return kmlFileName | 712 return kmlFileName |
706 | 713 |
707 def trydatahas_key(self,data,index,key_string): | 714 def trydatahas_key(self,data,index,key_string): |
715 logging.debug("trying:"+key_string) | |
708 try: | 716 try: |
709 return data[index].has_key(key_string) | 717 return data[index].has_key(key_string) |
710 except: | 718 except: |
711 return 'false' | 719 return 'false' |
712 | 720 |