|
113 | 113 | $osm_sub_album = create_virtual_category("OSM".$_GET['min_lat']."", $osm_album['id'], $options); |
114 | 114 |
|
115 | 115 | /* Get all items inside the lat and lng */ |
116 | | - $query="SELECT `id`, `latitude`, `longitude`, `name` |
| 116 | + $query="SELECT `id`, `latitude`, `longitude`, IFNULL(`name`, '') AS `name` |
117 | 117 | FROM ".IMAGES_TABLE." |
118 | 118 | WHERE `latitude` IS NOT NULL AND `longitude` IS NOT NULL |
119 | 119 | AND `latitude` > ".$_GET['min_lat']." AND `latitude` < ".$_GET['max_lat']." |
120 | 120 | AND `longitude` > ".$_GET['min_lng']." AND `longitude` < ".$_GET['max_lng']." |
121 | | -group by `name`;"; |
| 121 | +;"; |
122 | 122 |
|
123 | 123 | $items = hash_from_query( $query, 'id'); |
124 | 124 |
|
|
149 | 149 | // SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1) full path without filename extension |
150 | 150 | // SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1) full path with only filename extension |
151 | 151 |
|
152 | | -$query="SELECT `latitude`, `longitude`, `name`, |
| 152 | +$query="SELECT `latitude`, `longitude`, |
| 153 | +IFNULL(`name`, '') AS `name`, |
153 | 154 | IF(`representative_ext` IS NULL, |
154 | 155 | CONCAT(SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1 ), '-sq.', SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1 )), |
155 | 156 | TRIM(LEADING '.' FROM |
|
169 | 170 | `width` |
170 | 171 | FROM ".IMAGES_TABLE." AS i |
171 | 172 | INNER JOIN ".IMAGE_CATEGORY_TABLE." AS ic ON id = ic.image_id |
172 | | - WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." group by `name`;"; |
| 173 | + WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." ;"; |
173 | 174 | //echo $query; |
174 | 175 | $php_data = array_from_query($query); |
175 | 176 | //print_r($php_data); |
|
0 commit comments