Skip to content

Commit 1fc652e

Browse files
committed
Avoid duplicate picture #18 #23
1 parent d4e7f5d commit 1fc652e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

osmmap2.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@
113113
$osm_sub_album = create_virtual_category("OSM".$_GET['min_lat']."", $osm_album['id'], $options);
114114

115115
/* Get all items inside the lat and lng */
116-
$query="SELECT `id`, `latitude`, `longitude`, IFNULL(`name`, '') AS `name`
116+
$query="SELECT `id`, `latitude`, `longitude`
117117
FROM ".IMAGES_TABLE."
118118
WHERE `latitude` IS NOT NULL AND `longitude` IS NOT NULL
119119
AND `latitude` > ".$_GET['min_lat']." AND `latitude` < ".$_GET['max_lat']."
120120
AND `longitude` > ".$_GET['min_lng']." AND `longitude` < ".$_GET['max_lng']."
121-
;";
121+
GROUP BY id;";
122122

123123
$items = hash_from_query( $query, 'id');
124124

@@ -149,7 +149,7 @@
149149
// SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1) full path without filename extension
150150
// SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1) full path with only filename extension
151151

152-
$query="SELECT `latitude`, `longitude`,
152+
$query="SELECT `id`, `latitude`, `longitude`,
153153
IFNULL(`name`, '') AS `name`,
154154
IF(`representative_ext` IS NULL,
155155
CONCAT(SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1 ), '-sq.', SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1 )),
@@ -170,7 +170,7 @@
170170
`width`
171171
FROM ".IMAGES_TABLE." AS i
172172
INNER JOIN ".IMAGE_CATEGORY_TABLE." AS ic ON id = ic.image_id
173-
WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." ;";
173+
WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." GROUP BY id;";
174174
//echo $query;
175175
$php_data = array_from_query($query);
176176
//print_r($php_data);

0 commit comments

Comments
 (0)