|
89 | 89 | } |
90 | 90 | } |
91 | 91 |
|
| 92 | +$forbidden = get_sql_condition_FandF( |
| 93 | + array |
| 94 | + ( |
| 95 | + 'forbidden_categories' => 'category_id', |
| 96 | + 'visible_categories' => 'category_id', |
| 97 | + 'visible_images' => 'id' |
| 98 | + ), |
| 99 | + "\n AND" |
| 100 | +); |
| 101 | + |
92 | 102 | /* We have lat and lng coordonate for virtual album */ |
93 | 103 | if (isset($_GET['min_lat']) and isset($_GET['max_lat']) and isset($_GET['min_lng']) and isset($_GET['max_lng'])) |
94 | 104 | { |
|
118 | 128 | WHERE `latitude` IS NOT NULL AND `longitude` IS NOT NULL |
119 | 129 | AND `latitude` > ".$_GET['min_lat']." AND `latitude` < ".$_GET['max_lat']." |
120 | 130 | AND `longitude` > ".$_GET['min_lng']." AND `longitude` < ".$_GET['max_lng']." |
121 | | -GROUP BY id;"; |
| 131 | +".$forbidden." GROUP BY id;"; |
122 | 132 |
|
123 | 133 | $items = hash_from_query( $query, 'id'); |
124 | 134 |
|
|
134 | 144 | exit; |
135 | 145 | } |
136 | 146 |
|
137 | | -$forbidden = get_sql_condition_FandF( |
138 | | - array |
139 | | - ( |
140 | | - 'forbidden_categories' => 'category_id', |
141 | | - 'visible_categories' => 'category_id', |
142 | | - 'visible_images' => 'id' |
143 | | - ), |
144 | | - "\n AND" |
145 | | -); |
146 | | - |
147 | 147 | // Fetch data with latitude and longitude |
148 | 148 | //$query="SELECT `latitude`, `longitude`, `name`, `path` FROM ".IMAGES_TABLE." WHERE `latitude` IS NOT NULL AND `longitude` IS NOT NULL;"; |
149 | 149 | // SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1) full path without filename extension |
|
325 | 325 | options: { |
326 | 326 | iconUrl: ".$pinpath.", |
327 | 327 | shadowUrl: ".$pinshadowpath.", |
328 | | - iconSize: ".$pinsize.", |
329 | | - shadowSize: ".$pinshadowsize.", |
330 | | - iconAnchor: ".$pinoffset.", |
331 | | - shadowAnchor: ".$pinoffset.", |
332 | | - popupAnchor: ".$pinpopupoffset." |
| 328 | + iconSize: [".$pinsize."], |
| 329 | + shadowSize: [".$pinshadowsize."], |
| 330 | + iconAnchor: [".$pinoffset."], |
| 331 | + shadowAnchor: [".$pinoffset."], |
| 332 | + popupAnchor: [".$pinpopupoffset."] |
333 | 333 | } |
334 | 334 | });"; |
335 | 335 | } |
|
0 commit comments