@@ -19,7 +19,7 @@ |
||
19 | 19 | |
20 | 20 | protected function setFlatten(Collection $regions) |
21 | 21 | { |
22 | - $regions->each(function (RegionModel $region) { |
|
22 | + $regions->each(function(RegionModel $region) { |
|
23 | 23 | $this->regions->add($this->flatten($region)); |
24 | 24 | }); |
25 | 25 | $this->regions = $this->regions->flatten(5); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | $points = explode(',', $pointString); |
47 | 47 | |
48 | - $decoded = array_map(function ($point) { |
|
48 | + $decoded = array_map(function($point) { |
|
49 | 49 | $_value = array_reverse(explode(' ', trim($point))); |
50 | 50 | return [(float) $_value[0], (float) $_value[1]]; |
51 | 51 | }, $points); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function set($model, $key, $value, $attributes) |
66 | 66 | { |
67 | 67 | $srid = 4326; |
68 | - $array = Arr::map($value, function ($rs) { |
|
68 | + $array = Arr::map($value, function($rs) { |
|
69 | 69 | return Arr::join(array_reverse($rs), ' '); |
70 | 70 | }); |
71 | 71 | return DB::raw("ST_GeomFromText('LINESTRING(" . Arr::join($array, ',') . ")',$srid)"); |
@@ -25,7 +25,7 @@ |
||
25 | 25 | */ |
26 | 26 | protected function loadRecursively(RegionModel $region, string $code, int $deep = 0):Collection |
27 | 27 | { |
28 | - $regions = new Collection(); |
|
28 | + $regions = new Collection(); |
|
29 | 29 | if ($region->code === $code) { |
30 | 30 | $regions = $region->children; |
31 | 31 | if ($deep > 0) { |
@@ -78,6 +78,6 @@ |
||
78 | 78 | */ |
79 | 79 | public function getAttributes():array |
80 | 80 | { |
81 | - return ['name','short','code','area','zip','lng','lat']; |
|
81 | + return ['name', 'short', 'code', 'area', 'zip', 'lng', 'lat']; |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | \ No newline at end of file |
@@ -56,11 +56,11 @@ |
||
56 | 56 | protected function bindMacroService(): void |
57 | 57 | { |
58 | 58 | if (class_exists(SimpleService::class)) { |
59 | - SimpleService::macro('queryDistance', function (SimpleService $service, float $lat, float $lng, float $maxDistance = 50, string $geoColumn) { |
|
59 | + SimpleService::macro('queryDistance', function(SimpleService $service, float $lat, float $lng, float $maxDistance = 50, string $geoColumn) { |
|
60 | 60 | $distanceService = new DistanceService; |
61 | 61 | return $distanceService->queryDistance($service, $lat, $lng, $maxDistance, $geoColumn); |
62 | 62 | }); |
63 | - SimpleService::macro('selectDistance', function (SimpleService $service, float $lat, float $lng, string $geoColumn, string $alias) { |
|
63 | + SimpleService::macro('selectDistance', function(SimpleService $service, float $lat, float $lng, string $geoColumn, string $alias) { |
|
64 | 64 | $distanceService = new DistanceService; |
65 | 65 | return $distanceService->selectDistance($service, $lat, $lng, $geoColumn, $alias); |
66 | 66 | }); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | */ |
12 | 12 | public function up(): void |
13 | 13 | { |
14 | - Schema::create('regions', function (Blueprint $table) { |
|
14 | + Schema::create('regions', function(Blueprint $table) { |
|
15 | 15 | $table->id(); |
16 | 16 | $table->string('name')->comment('社区名称'); |
17 | 17 | $table->string('city_code')->comment("城市代码"); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public static function bootRegionTrait() |
29 | 29 | { |
30 | - static::deleting(function ($model) { |
|
30 | + static::deleting(function($model) { |
|
31 | 31 | $model->region->each(fn(Region $region) => $region->delete()); |
32 | 32 | }); |
33 | 33 | } |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | * @param array $codes |
48 | 48 | * @return mixed |
49 | 49 | */ |
50 | - public function scopeWithGeoDistance($query, float $lat,float $lng,int $distance = 5000) |
|
50 | + public function scopeWithGeoDistance($query, float $lat, float $lng, int $distance = 5000) |
|
51 | 51 | { |
52 | 52 | $raw = "ST_Distance_Sphere(geo,ST_GeomFromText('POINT($lng $lat)',4326))"; |
53 | - return $query->whereHas('region', function ($q) use ($raw,$distance) { |
|
54 | - $q->select(DB::raw($raw.' as distance'))->where("distance <= $distance"); |
|
53 | + return $query->whereHas('region', function($q) use ($raw, $distance) { |
|
54 | + $q->select(DB::raw($raw . ' as distance'))->where("distance <= $distance"); |
|
55 | 55 | }); |
56 | 56 | } |
57 | 57 |
@@ -55,7 +55,7 @@ |
||
55 | 55 | { |
56 | 56 | $this->selectDistance($service, $lat, $lng, $column); |
57 | 57 | $distanceRaw = $this->distanceRaw($lat, $lng, $column); |
58 | - $service->setQuery(function (Builder $query) use ($distanceRaw, $maxDistance) { |
|
58 | + $service->setQuery(function(Builder $query) use ($distanceRaw, $maxDistance) { |
|
59 | 59 | $query->whereRaw("$distanceRaw <= $maxDistance"); |
60 | 60 | }); |
61 | 61 | return $service; |