Changeset 2508955
- Timestamp:
- 04/04/2021 01:41:49 PM (5 years ago)
- Location:
- shmapper-by-teplitsa
- Files:
-
- 132 added
- 3 edited
-
tags/1.4.2 (added)
-
tags/1.4.2/LICENSE.txt (added)
-
tags/1.4.2/README.md (added)
-
tags/1.4.2/README.txt (added)
-
tags/1.4.2/assets (added)
-
tags/1.4.2/assets/css (added)
-
tags/1.4.2/assets/css/MarkerCluster.Default.css (added)
-
tags/1.4.2/assets/css/MarkerCluster.css (added)
-
tags/1.4.2/assets/css/ShMapper.css (added)
-
tags/1.4.2/assets/css/ShMapperDrive.css (added)
-
tags/1.4.2/assets/css/easyGeocoder.css (added)
-
tags/1.4.2/assets/css/layerSwitcher.css (added)
-
tags/1.4.2/assets/google-sheets (added)
-
tags/1.4.2/assets/google-sheets/composer.json (added)
-
tags/1.4.2/assets/google-sheets/composer.lock (added)
-
tags/1.4.2/assets/google-sheets/google-sheets.php (added)
-
tags/1.4.2/assets/google-sheets/vendor (added)
-
tags/1.4.2/assets/google-sheets/vendor/autoload.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/ClassLoader.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/LICENSE (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_classmap.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_files.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_namespaces.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_psr4.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_real.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/autoload_static.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/composer/installed.json (added)
-
tags/1.4.2/assets/google-sheets/vendor/league (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/CHANGELOG.md (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/LICENSE (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/autoload.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/composer.json (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/AbstractCsv.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/ByteSequence.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/CannotInsertRecord.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/CharsetConverter.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/ColumnConsistency.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/EncloseField.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/EscapeFormula.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Exception.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/HTMLConverter.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/InvalidArgument.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/MapIterator.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Polyfill (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Polyfill/EmptyEscapeParser.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/RFC4180Field.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Reader.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/ResultSet.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Statement.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Stream.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/SyntaxError.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/UnavailableFeature.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/Writer.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/XMLConverter.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/functions.php (added)
-
tags/1.4.2/assets/google-sheets/vendor/league/csv/src/functions_include.php (added)
-
tags/1.4.2/assets/img (added)
-
tags/1.4.2/assets/img/camera.png (added)
-
tags/1.4.2/assets/img/check_checked.png (added)
-
tags/1.4.2/assets/img/check_unchecked.png (added)
-
tags/1.4.2/assets/img/close.svg (added)
-
tags/1.4.2/assets/img/csv_icon.png (added)
-
tags/1.4.2/assets/img/easyGeocoder-marker.svg (added)
-
tags/1.4.2/assets/img/empty.png (added)
-
tags/1.4.2/assets/img/fullscreen.png (added)
-
tags/1.4.2/assets/img/fullscreen@2x.png (added)
-
tags/1.4.2/assets/img/loader.gif (added)
-
tags/1.4.2/assets/img/marker-shadow.png (added)
-
tags/1.4.2/assets/img/pin.svg (added)
-
tags/1.4.2/assets/img/shmapper.svg (added)
-
tags/1.4.2/assets/img/shmapper_32x32.svg (added)
-
tags/1.4.2/assets/img/shmapper_32x32_white.svg (added)
-
tags/1.4.2/assets/img/source-icons (added)
-
tags/1.4.2/assets/img/source-icons/easyGeocoder-result-icon.svg (added)
-
tags/1.4.2/assets/img/source-icons/easyGeocoder-search-icon.svg (added)
-
tags/1.4.2/assets/img/source-icons/easyGeocoder-throbber.svg (added)
-
tags/1.4.2/assets/img/ym_default.png (added)
-
tags/1.4.2/assets/js (added)
-
tags/1.4.2/assets/js/Leaflet.fullscreen.min.js (added)
-
tags/1.4.2/assets/js/Leaflet.layerSwitcher.js (added)
-
tags/1.4.2/assets/js/ShMapper.admin.js (added)
-
tags/1.4.2/assets/js/ShMapper.front.js (added)
-
tags/1.4.2/assets/js/ShMapper.js (added)
-
tags/1.4.2/assets/js/ShMapper.yandex.js (added)
-
tags/1.4.2/assets/js/ShMapperDrive.admin.js (added)
-
tags/1.4.2/assets/js/ShMapperDrive.front.js (added)
-
tags/1.4.2/assets/js/ShMapper_osm.js (added)
-
tags/1.4.2/assets/js/easyGeocoder.js (added)
-
tags/1.4.2/assets/js/esri-leaflet.js (added)
-
tags/1.4.2/assets/js/leaflet.js (added)
-
tags/1.4.2/assets/js/leaflet.markercluster-src.js (added)
-
tags/1.4.2/assets/recaptcha-php (added)
-
tags/1.4.2/assets/recaptcha-php/example-captcha.php (added)
-
tags/1.4.2/assets/recaptcha-php/example-mailhide.php (added)
-
tags/1.4.2/assets/recaptcha-php/recaptcha.class.php (added)
-
tags/1.4.2/assets/recaptcha-php/recaptchalib.php (added)
-
tags/1.4.2/class (added)
-
tags/1.4.2/class/SMC_Object_type.php (added)
-
tags/1.4.2/class/SMC_Post.php (added)
-
tags/1.4.2/class/ShMapPointType.class.php (added)
-
tags/1.4.2/class/ShMapper.class.php (added)
-
tags/1.4.2/class/ShMapperDrive.class.php (added)
-
tags/1.4.2/class/ShMapperDrive_ajax.class.php (added)
-
tags/1.4.2/class/ShMapperDriverPreview.class.php (added)
-
tags/1.4.2/class/ShMapperPointMessage.class.php (added)
-
tags/1.4.2/class/ShMapperRequest.class.php (added)
-
tags/1.4.2/class/ShMapper_Assistants.class.php (added)
-
tags/1.4.2/class/ShMapper_ajax.class.php (added)
-
tags/1.4.2/class/ShmAdminPage.class.php (added)
-
tags/1.4.2/class/ShmForm.class.php (added)
-
tags/1.4.2/class/ShmMap.class.php (added)
-
tags/1.4.2/class/ShmPoint.class.php (added)
-
tags/1.4.2/languages (added)
-
tags/1.4.2/languages/shmapper-by-teplitsa-de_DE.mo (added)
-
tags/1.4.2/languages/shmapper-by-teplitsa-de_DE.po (added)
-
tags/1.4.2/languages/shmapper-by-teplitsa-ru_RU.mo (added)
-
tags/1.4.2/languages/shmapper-by-teplitsa-ru_RU.po (added)
-
tags/1.4.2/languages/shmapper-by-teplitsa.pot (added)
-
tags/1.4.2/shmapper.php (added)
-
tags/1.4.2/shortcode (added)
-
tags/1.4.2/shortcode/shmMap.shortcode.php (added)
-
tags/1.4.2/shortcode/shmMapFeed.shortcode.php (added)
-
tags/1.4.2/shortcode/shm_shortcodes.php (added)
-
tags/1.4.2/tpl (added)
-
tags/1.4.2/tpl/input_file_form.php (added)
-
tags/1.4.2/tpl/shmMap.php (added)
-
tags/1.4.2/unistall.php (added)
-
tags/1.4.2/widget (added)
-
tags/1.4.2/widget/ShMap.widget.php (added)
-
trunk/README.txt (modified) (1 diff)
-
trunk/class/ShMapperDriverPreview.class.php (modified) (10 diffs)
-
trunk/shmapper.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shmapper-by-teplitsa/trunk/README.txt
r2481970 r2508955 4 4 Plugin URI: http://genagl.ru/?p=652 5 5 Tags: map, OpenStreetMap, OSM, yandex.map, crowdsourcing, карта, Яндекс.карты, картирование, mapping, crowdsourced mapping, user mapping 6 Requires at least: 3.6.17 Tested up to: 5. 5.16 Requires at least: 5.0 7 Tested up to: 5.7 8 8 Requires PHP: 5.6 9 9 Stable tag: trunk -
shmapper-by-teplitsa/trunk/class/ShMapperDriverPreview.class.php
r2481968 r2508955 1 <?php 1 <?php 2 2 3 3 class ShMapperDriverPreview … … 33 33 $icon = ShMapPointType::get_icon($type, false, false); 34 34 $geocode = implode(" - " , static::getGeoPosition( $m )); 35 35 36 36 if(ShMapperDrive::$options['is_google_post_date']) 37 37 $post_date = strtotime( $m[ getSingleGoogleOrder(ShMapperDrive::$options['post_date']) ]); … … 122 122 $icon = ShMapPointType::get_icon($type, false, false); 123 123 124 // post_date - 4 124 // post_date - 4 125 125 if(ShMapperDrive::$options['is_google_post_date']) 126 126 $post_date = strtotime( $m[ getSingleGoogleOrder(ShMapperDrive::$options['post_date']) ]); … … 148 148 $post_title = $m[ getSingleGoogleOrder(ShMapperDrive::$options['shmd_post_title']) ]; 149 149 $post_content = $m[ getSingleGoogleOrder(ShMapperDrive::$options['shmd_post_desc']) ]; 150 //$post_content = $cont ; 150 151 151 $point = ShMapperPointMessage::insert([ 152 152 'post_name' => $post_title, … … 177 177 } 178 178 $icon = ShMapPointType::get_icon($type, false, false); 179 180 // post_date - 4 179 180 // post_date - 4 181 181 if(ShMapperDrive::$options['is_google_post_date']) 182 182 $post_date = strtotime( $m[ getSingleGoogleOrder(ShMapperDrive::$options['post_date']) ]); 183 183 else 184 184 $post_date = time(); 185 186 185 $ii = 0; 187 186 foreach(ShMapperDrive::$options['google_matrix_data'] as $n) … … 204 203 $post_title = $m[ getSingleGoogleOrder(ShMapperDrive::$options['shmd_post_title']) ]; 205 204 $post_content = $m[ getSingleGoogleOrder(ShMapperDrive::$options['shmd_post_desc']) ]; 206 //$post_content = $cont; 205 207 206 $point = ShmPoint::insert([ 208 207 'post_name' => $post_title, … … 223 222 $i++; 224 223 } 225 226 //var_dump($copies ); 227 //wp_die(); 228 229 } 230 static function delete() 231 { 232 static::$google_table_id = ShMapperDrive::$options["google_table_id"]; 224 225 } 226 static function delete() { 227 static::$google_table_id = ShMapperDrive::$options["google_table_id"]; 233 228 $posts = get_posts([ 234 229 "numberposts" => -1, … … 244 239 ] 245 240 ] 246 ]); 247 //var_dump( $posts ); 248 //wp_die(); 241 ] ); 242 249 243 if( count($posts) > 0 ) 250 244 { … … 255 249 } 256 250 } 257 258 static function getGeoPosition( $m ) 259 { 260 switch( ShMapperDrive::$options['google_geo_position']) 261 { 251 252 static function getGeoPosition( $m ) { 253 switch( ShMapperDrive::$options['google_geo_position'] ) { 262 254 case 0: 263 255 return [ 264 $m[ getSingleGoogleOrder( static::$options['google_geo_lon'] ) ],265 $m[ getSingleGoogleOrder( static::$options['google_geo_lat'] ) ]256 $m[ getSingleGoogleOrder( ShMapperDrive::$options['google_geo_lon'] ) ], 257 $m[ getSingleGoogleOrder( ShMapperDrive::$options['google_geo_lat'] ) ] 266 258 ]; 267 259 case 1: … … 273 265 } 274 266 } 275 static function geocode($address) 276 { 267 static function geocode($address) { 277 268 //$address = "Москва, Тверская, 12"; 278 269 $key = "921be5a4-36cd-4485-8f57-2c24f94dab32"; -
shmapper-by-teplitsa/trunk/shmapper.php
r2481968 r2508955 4 4 * Plugin URI: http://genagl.ru/?p=652 5 5 * Description: Location and logistics services for NKO 6 * Version: 1.4. 16 * Version: 1.4.2 7 7 * Requires at least: 5.0 8 8 * Requires PHP: 5.6 … … 36 36 along with this program; if not, write to the Free Software 37 37 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 38 */38 */ 39 39 40 40 /** Load textdomain */
Note: See TracChangeset
for help on using the changeset viewer.