Reviewed: https://reviews.mahara.org/3471 Committed: http://gitorious.org/mahara/mahara/commit/f6e95ea25d24e99863392500ad86f866457b2d35 Submitter: Robert Lyon (<email address hidden>) Branch: master
commit f6e95ea25d24e99863392500ad86f866457b2d35 Author: Nigel Cunningham <email address hidden> Date: Thu Jul 3 15:04:45 2014 +1000
Bug1323495: Make new/modified Google Maps work
This patch modifies one regex and adds more, to handle the various new possibilities for source URLs from Google Maps.
Tested using blocks with the following URLs:
https://mapsengine.google.com/map/edit?mid=zfwEiFwRAMSY.kHxFNhFy8iAs
http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=patagonia,+argentina&aq=&sll=33.935442,-118.080497&sspn=1.663434,2.17804&ie=UTF8&hq=&hnear=Patagonia&t=m&z=5&ll=-41.810147,-68.906269&output=embed
https://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=115.5683895w+51.176933999999996n&aq=&sll=37.0625,-95.677068&sspn=40.953203,79.013672&ie=UTF8&t=m&z=14&ll=51.176934,-115.56839&output=embed
https://maps.google.com/maps?ll=-41.24437,174.761855&spn=0.371216,0.475845&t=h&z=11
https://maps.google.com/maps?ie=UTF8&ll=-41.24437,174.761855&spn=0.371216,0.475845&t=h&z=11&output=embed
https://www.google.com/maps/embed?pb=!1m14!1m12!1m3!1d20010.295562287632!2d-115.5683895!3d51.176933999999996!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2sca!4v1400737313821
https://www.google.com/maps?q=dee+why&hl=en&ll=-33.797088,151.277661&spn=0.026426,0.055704&sll=37.0625,-95.677068&sspn=51.089971,114.082031&hnear=Dee+Why+New+South+Wales,+Australia&t=m&z=15
https://www.google.com/maps?q=dee+why&hl=en&sll=37.0625,-95.677068&sspn=51.089971,114.082031&hnear=Dee+Why+New+South+Wales,+Australia&t=m&ie=UTF8&hq=&ll=-33.797088,151.277661&spn=0.026427,0.055704&z=14&output=embed
Change-Id: Ib5d6d9b14147ec875aa944f60feb9b69c02be85f Signed-off-by: Nigel Cunningham <email address hidden>
Reviewed: https:/ /reviews. mahara. org/3471 gitorious. org/mahara/ mahara/ commit/ f6e95ea25d24e99 863392500ad86f8 66457b2d35
Committed: http://
Submitter: Robert Lyon (<email address hidden>)
Branch: master
commit f6e95ea25d24e99 863392500ad86f8 66457b2d35
Author: Nigel Cunningham <email address hidden>
Date: Thu Jul 3 15:04:45 2014 +1000
Bug1323495: Make new/modified Google Maps work
This patch modifies one regex and adds more, to handle the various
new possibilities for source URLs from Google Maps.
Tested using blocks with the following URLs:
https:/ /mapsengine. google. com/map/ edit?mid= zfwEiFwRAMSY. kHxFNhFy8iAs
http:// maps.google. com/maps? f=q&source= s_q&hl= en&geocode= &q=patagonia, +argentina& aq=&sll= 33.935442, -118.080497& sspn=1. 663434, 2.17804& ie=UTF8& hq=&hnear= Patagonia& t=m&z=5& ll=-41. 810147, -68.906269& output= embed
https:/ /maps.google. com/maps? f=q&source= s_q&hl= en&geocode= &q=115. 5683895w+ 51.176933999999 996n&aq= &sll=37. 0625,-95. 677068& sspn=40. 953203, 79.013672& ie=UTF8& t=m&z=14& ll=51.176934, -115.56839& output= embed
https:/ /maps.google. com/maps? ll=-41. 24437,174. 761855& spn=0.371216, 0.475845& t=h&z=11
https:/ /maps.google. com/maps? ie=UTF8& ll=-41. 24437,174. 761855& spn=0.371216, 0.475845& t=h&z=11& output= embed
https:/ /www.google. com/maps/ embed?pb= !1m14!1m12! 1m3!1d20010. 295562287632! 2d-115. 5683895! 3d51.1769339999 99996!2m3! 1f0!2f0! 3f0!3m2! 1i1024! 2i768!4f13. 1!5e0!3m2! 1sen!2sca! 4v1400737313821
https:/ /www.google. com/maps? q=dee+why& hl=en&ll= -33.797088, 151.277661& spn=0.026426, 0.055704& sll=37. 0625,-95. 677068& sspn=51. 089971, 114.082031& hnear=Dee+ Why+New+ South+Wales, +Australia& t=m&z=15
https:/ /www.google. com/maps? q=dee+why& amp;hl= en& sll=37. 0625,-95. 677068& amp;sspn= 51.089971, 114.082031& amp;hnear= Dee+Why+ New+South+ Wales,+ Australia& amp;t=m& amp;ie= UTF8& hq=& ll=-33. 797088, 151.277661& amp;spn= 0.026427, 0.055704& amp;z=14& amp;output= embed
Change-Id: Ib5d6d9b14147ec 875aa944f60feb9 b69c02be85f
Signed-off-by: Nigel Cunningham <email address hidden>